Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: dispose SqlBulkBatchWriter in sink #603

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Fixed: dispose SqlBulkBatchWriter in sink #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
314f9ed
Fixed a typo
ckadluba Dec 5, 2024
a5d5e86
Fixed: dispose SqlBulkBatchWriter in sink
ckadluba Dec 5, 2024
2db0fa1
Added tests for disposing in sink classes
ckadluba Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ protected virtual void Dispose(bool disposing)
{
if (disposing)
{
_sqlBulkBatchWriter.Dispose();
_sqlLogEventWriter.Dispose();
}

Expand Down
11 changes: 10 additions & 1 deletion test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/MSSqlServerAuditSinkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using Moq;
using Serilog.Events;
using Serilog.Parsing;
Expand Down Expand Up @@ -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;
Expand Down
23 changes: 21 additions & 2 deletions test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/MSSqlServerSinkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using Moq;
using Serilog.Events;
Expand Down Expand Up @@ -173,7 +172,7 @@ public async Task EmitBatchAsyncWithUseSqlBulkCopyFalseCallsSqlLogEventWriter()
}

[Fact]
public void OnEmpytBatchAsyncReturnsCompletedTask()
public void OnEmptyBatchAsyncReturnsCompletedTask()
{
// Arrange
SetupSut();
Expand All @@ -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,
Expand Down
Loading