Skip to content

Commit dea6326

Browse files
authored
Merge pull request #602 from ckadluba/remove-exception-handlers
Remove obsolete exception handlers
2 parents 1ad392b + 8db2905 commit dea6326

File tree

3 files changed

+14
-29
lines changed

3 files changed

+14
-29
lines changed

CHANGES.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# 8.1.0
22
* Implemented #542: Column option `ResolveHierarchicalPropertyName` to force non-hierarchical handling
3-
4-
# 8.0.1
3+
* Removed unnecessary exception handlers and let Serilog Core do the SelfLog()
54
* Refactoring and performance optimizations in batched and audit sink
65
* Create perftest result on release
76
* Updated issue template

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlBulkBatchWriter.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ public async Task WriteBatch(IEnumerable<LogEvent> events)
6060
}
6161
}
6262
}
63-
catch (Exception ex)
64-
{
65-
SelfLog.WriteLine("Unable to write batch of {0} log events to the database due to following error: {1}",
66-
events.Count(), ex);
67-
throw;
68-
}
6963
finally
7064
{
7165
_dataTable.Clear();

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlInsertStatementWriter.cs

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,34 +43,26 @@ public SqlInsertStatementWriter(
4343

4444
public async Task WriteEvents(IEnumerable<LogEvent> events)
4545
{
46-
try
46+
using (var cn = _sqlConnectionFactory.Create())
4747
{
48-
using (var cn = _sqlConnectionFactory.Create())
48+
await cn.OpenAsync().ConfigureAwait(false);
49+
50+
foreach (var logEvent in events)
4951
{
50-
await cn.OpenAsync().ConfigureAwait(false);
52+
var fields = _logEventDataGenerator.GetColumnsAndValues(logEvent).ToList();
53+
InitializeSqlCommand(cn, fields);
5154

52-
foreach (var logEvent in events)
55+
var index = 0;
56+
_sqlCommand.ClearParameters();
57+
foreach (var field in fields)
5358
{
54-
var fields = _logEventDataGenerator.GetColumnsAndValues(logEvent).ToList();
55-
InitializeSqlCommand(cn, fields);
56-
57-
var index = 0;
58-
_sqlCommand.ClearParameters();
59-
foreach (var field in fields)
60-
{
61-
_sqlCommand.AddParameter(Invariant($"@P{index}"), field.Value);
62-
index++;
63-
}
64-
65-
await _sqlCommand.ExecuteNonQueryAsync().ConfigureAwait(false);
59+
_sqlCommand.AddParameter(Invariant($"@P{index}"), field.Value);
60+
index++;
6661
}
62+
63+
await _sqlCommand.ExecuteNonQueryAsync().ConfigureAwait(false);
6764
}
6865
}
69-
catch (Exception ex)
70-
{
71-
SelfLog.WriteLine("Unable to write log event to the database due to following error: {0}", ex);
72-
throw;
73-
}
7466
}
7567

7668
/// <summary>

0 commit comments

Comments
 (0)