Merge pull request #39 from colin-young/dev

Fix flushing of queued events during sink shut-down

Author: nblumhardt

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

@@ -48,7 +48,6 @@ public class MSSqlServerSink : PeriodicBatchingSink
         readonly DataTable _eventsTable;
         readonly IFormatProvider _formatProvider;
         readonly string _tableName;
-        readonly CancellationTokenSource _token = new CancellationTokenSource();
         private readonly ColumnOptions _columnOptions;
 
         private readonly HashSet<string> _additionalDataColumnNames;
@@ -129,7 +128,7 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
             {
                 using (var cn = new SqlConnection(_connectionString))
                 {
-                    await cn.OpenAsync(_token.Token).ConfigureAwait(false);
+                    await cn.OpenAsync().ConfigureAwait(false);
                     using (var copy = new SqlBulkCopy(cn))
                     {
                         copy.DestinationTableName = _tableName;
@@ -140,9 +139,8 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
                             copy.ColumnMappings.Add(mapping);
                         }
 
-                        await copy.WriteToServerAsync(_eventsTable, _token.Token).ConfigureAwait(false);
+                        await copy.WriteToServerAsync(_eventsTable).ConfigureAwait(false);
                     }
-
                 }
             }
             catch (Exception ex)
@@ -436,8 +434,6 @@ private static bool TryChangeType(object obj, Type type, out object conversion)
         /// <param name="disposing"></param>
         protected override void Dispose(bool disposing)
         {
-            _token.Cancel();
-
             if (_eventsTable != null)
                 _eventsTable.Dispose();
 

test/Serilog.Sinks.MSSqlServer.Tests/project.lock.json

@@ -362,7 +362,7 @@
           "lib/net35/xunit.runner.utility.desktop.dll": {}
         }
       },
-      "Serilog.Sinks.MSSqlServer/4.0.0": {
+      "Serilog.Sinks.MSSqlServer/4.1.0": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -708,7 +708,7 @@
           "lib/net35/xunit.runner.utility.desktop.dll": {}
         }
       },
-      "Serilog.Sinks.MSSqlServer/4.0.0": {
+      "Serilog.Sinks.MSSqlServer/4.1.0": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -1166,7 +1166,7 @@
         "xunit.runner.utility.nuspec"
       ]
     },
-    "Serilog.Sinks.MSSqlServer/4.0.0": {
+    "Serilog.Sinks.MSSqlServer/4.1.0": {
       "type": "project",
       "path": "../../src/Serilog.Sinks.MSSqlServer/project.json",
       "msbuildProject": "../../src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.xproj"