Merge pull request #603 from ckadluba/fix-dispose

Fixed: dispose SqlBulkBatchWriter in sink

Author: ckadluba

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

@@ -151,6 +151,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
+                    _sqlBulkBatchWriter.Dispose();
                     _sqlLogEventWriter.Dispose();
                 }
 

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/MSSqlServerAuditSinkTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using Moq;
 using Serilog.Events;
 using Serilog.Parsing;
@@ -157,6 +156,16 @@ public void EmitCallsSqlLogEventWriter()
             _sqlLogEventWriter.Verify(w => w.WriteEvent(logEvent), Times.Once);
         }
 
+        [Fact]
+        public void OnDisposeDisposesSqlLogEventWriterDependency()
+        {
+            // Arrange + act
+            using (new MSSqlServerAuditSink(_sinkOptions, _columnOptions, _sinkDependencies)) { }
+
+            // Assert
+            _sqlLogEventWriter.Verify(w => w.Dispose(), Times.Once);
+        }
+
         private void SetupSut(bool autoCreateSqlDatabase = false, bool autoCreateSqlTable = false)
         {
             _sinkOptions.AutoCreateSqlDatabase = autoCreateSqlDatabase;

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/MSSqlServerSinkTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Threading.Tasks;
 using Moq;
 using Serilog.Events;
@@ -173,7 +172,7 @@ public async Task EmitBatchAsyncWithUseSqlBulkCopyFalseCallsSqlLogEventWriter()
         }
 
         [Fact]
-        public void OnEmpytBatchAsyncReturnsCompletedTask()
+        public void OnEmptyBatchAsyncReturnsCompletedTask()
         {
             // Arrange
             SetupSut();
@@ -185,6 +184,26 @@ public void OnEmpytBatchAsyncReturnsCompletedTask()
             Assert.True(task.IsCompleted);
         }
 
+        [Fact]
+        public void OnDisposeDisposesSqlBulkBatchWriterDependency()
+        {
+            // Arrange + act
+            using (new MSSqlServerSink(_sinkOptions, _sinkDependencies)) { }
+
+            // Assert
+            _sqlBulkBatchWriter.Verify(w => w.Dispose(), Times.Once);
+        }
+
+        [Fact]
+        public void OnDisposeDisposesSqlLogEventWriterDependency()
+        {
+            // Arrange + act
+            using (new MSSqlServerSink(_sinkOptions, _sinkDependencies)) { }
+
+            // Assert
+            _sqlLogEventWriter.Verify(w => w.Dispose(), Times.Once);
+        }
+
         private void SetupSut(
             bool autoCreateSqlDatabase = false,
             bool autoCreateSqlTable = false,