Skip to content

Commit f9c884b

Browse files
author
Colin Young
committed
Merge branch 'dev' into custom-column-names
2 parents 1f6d580 + 6bbe40b commit f9c884b

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class MSSqlServerSink : PeriodicBatchingSink
4848
readonly DataTable _eventsTable;
4949
readonly IFormatProvider _formatProvider;
5050
readonly string _tableName;
51-
readonly CancellationTokenSource _token = new CancellationTokenSource();
5251
private readonly ColumnOptions _columnOptions;
5352

5453
private readonly HashSet<string> _additionalDataColumnNames;
@@ -129,7 +128,7 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
129128
{
130129
using (var cn = new SqlConnection(_connectionString))
131130
{
132-
await cn.OpenAsync(_token.Token).ConfigureAwait(false);
131+
await cn.OpenAsync().ConfigureAwait(false);
133132
using (var copy = new SqlBulkCopy(cn))
134133
{
135134
copy.DestinationTableName = _tableName;
@@ -140,9 +139,8 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
140139
copy.ColumnMappings.Add(mapping);
141140
}
142141

143-
await copy.WriteToServerAsync(_eventsTable, _token.Token).ConfigureAwait(false);
142+
await copy.WriteToServerAsync(_eventsTable).ConfigureAwait(false);
144143
}
145-
146144
}
147145
}
148146
catch (Exception ex)
@@ -393,8 +391,6 @@ protected override void Dispose(bool disposing)
393391
_eventsTable.Dispose();
394392

395393
base.Dispose(disposing);
396-
397-
_token.Cancel();
398394
}
399395
}
400396
}

0 commit comments

Comments
 (0)