Don't resume the PortableTimer background task on the captured contex…

…t that initiated it.
ite-klass · Nov 20, 2015 · e5f3858 · e5f3858
1 parent 8ae5284
commit e5f3858
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/Serilog/Sinks/PeriodicBatching/PortableTimer.cs b/src/Serilog/Sinks/PeriodicBatching/PortableTimer.cs
@@ -64,7 +64,7 @@ public async void Start(TimeSpan interval)
 
             try
             {
-                await Task.Delay(interval, _cancel.Token);
+                await Task.Delay(interval, _cancel.Token).ConfigureAwait(false);
 
                 _state = PortableTimerState.Active;
 
@@ -90,8 +90,6 @@ public void Dispose()
 
             while (true)
             {
-                // Thread.Sleep() would be handy here...
-
                 lock (_stateLock)
                 {
                     if (_state == PortableTimerState.Disposed ||
@@ -101,6 +99,8 @@ public void Dispose()
                         return;
                     }
                 }
+
+                Thread.Sleep(10);
             }
         }
     }

diff --git a/test/Serilog.Tests/Sinks/PeriodicBatching/PeriodicBatchingSinkTests.cs b/test/Serilog.Tests/Sinks/PeriodicBatching/PeriodicBatchingSinkTests.cs
@@ -82,15 +82,9 @@ public void WhenAnEventIsEnqueuedItIsWrittenToABatch_OnFlush()
         public void WhenAnEventIsEnqueuedItIsWrittenToABatch_OnTimer()
         {
             var pbs = new InMemoryPeriodicBatchingSink(2, TinyWait, TimeSpan.Zero);
-            Task.Run(() =>
-            {
-                Console.WriteLine("TEST: Writing");
-                var evt = Some.InformationEvent();
-                pbs.Emit(evt);
-            });
-            Console.WriteLine("TEST: Sleeping");
-            Thread.Sleep(TimeSpan.FromSeconds(1));
-            Console.WriteLine("TEST: Stopping");
+            var evt = Some.InformationEvent();
+            pbs.Emit(evt);
+            Thread.Sleep(TinyWait + TinyWait);
             pbs.Stop();
             Assert.Equal(1, pbs.Batches.Count);
             Assert.False(pbs.WasCalledAfterDisposal);