From 8de528bd4def1189f140ef9c59c90e92634e0180 Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tstanciu@totalsoft.ro>
Date: Sun, 5 Dec 2021 22:48:35 +0200
Subject: [PATCH] Serilog upgrade

---
 dependencies.props                              | 10 +++++-----
 src/api/NetworkResurrector.Api/Program.cs       | 10 ++++++++--
 src/server/NetworkResurrector.Server/Program.cs | 10 ++++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index ec53fe9..6f93ade 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup Label="Package Versions">
-    <MicrosoftExtensionsPackageVersion>3.1.3</MicrosoftExtensionsPackageVersion>
-    <SerilogPackageVersion>3.2.0</SerilogPackageVersion>
-    <SerilogExtensionsPackageVersion>3.0.1</SerilogExtensionsPackageVersion>
-    <SerilogSinksConsolePackageVersion>3.1.1</SerilogSinksConsolePackageVersion>
-    <SerilogSinksMSSqlServerPackageVersion>5.2.0</SerilogSinksMSSqlServerPackageVersion>
+    <MicrosoftExtensionsPackageVersion>3.1.8</MicrosoftExtensionsPackageVersion>
+	<SerilogPackageVersion>4.1.0</SerilogPackageVersion>
+	<SerilogExtensionsPackageVersion>3.1.0</SerilogExtensionsPackageVersion>
+	<SerilogSinksConsolePackageVersion>4.0.0</SerilogSinksConsolePackageVersion>
+	<SerilogSinksMSSqlServerPackageVersion>5.6.1</SerilogSinksMSSqlServerPackageVersion>
     <AutoMapperPackageVersion>9.0.0</AutoMapperPackageVersion>
     <AutoMapperExtensionsPackageVersion>7.0.0</AutoMapperExtensionsPackageVersion>
     <MediatRPackageVersion>6.0.0</MediatRPackageVersion>
diff --git a/src/api/NetworkResurrector.Api/Program.cs b/src/api/NetworkResurrector.Api/Program.cs
index 1929c94..d3a1b2d 100644
--- a/src/api/NetworkResurrector.Api/Program.cs
+++ b/src/api/NetworkResurrector.Api/Program.cs
@@ -33,19 +33,25 @@ namespace NetworkResurrector.Api
             var connectionString = configuration.GetConnectionString("DatabaseConnection");
             var loggingLevelParam = configuration.GetValue<string>("Logging:LogLevel:Default");
 
-            Enum.TryParse(loggingLevelParam, out LogEventLevel loggingLevel);
+            var loggingLevelOk = Enum.TryParse(loggingLevelParam, out LogEventLevel loggingLevel);
+            if (!loggingLevelOk)
+                throw new Exception($"Logging level '{loggingLevelParam}' is not valid.");
+
             var loggingLevelSwitch = new LoggingLevelSwitch(loggingLevel);
 
             var columnOptions = new ColumnOptions();
             columnOptions.Store.Remove(StandardColumn.Properties);
             columnOptions.Store.Remove(StandardColumn.MessageTemplate);
             columnOptions.Store.Add(StandardColumn.LogEvent);
+
+            var mssqlSinkOptions = new MSSqlServerSinkOptions() { AutoCreateSqlTable = true, TableName = "__Logs" };
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.ControlledBy(loggingLevelSwitch)
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.Console()
-                .WriteTo.MSSqlServer(connectionString, "__Logs", autoCreateSqlTable: true, columnOptions: columnOptions)
+                .WriteTo.MSSqlServer(connectionString, mssqlSinkOptions, columnOptions: columnOptions)
                 .CreateLogger();
 
             try
diff --git a/src/server/NetworkResurrector.Server/Program.cs b/src/server/NetworkResurrector.Server/Program.cs
index 5dbd226..ef00d5a 100644
--- a/src/server/NetworkResurrector.Server/Program.cs
+++ b/src/server/NetworkResurrector.Server/Program.cs
@@ -33,19 +33,25 @@ namespace NetworkResurrector.Server
             var connectionString = configuration.GetConnectionString("DatabaseConnection");
             var loggingLevelParam = configuration.GetValue<string>("Logging:LogLevel:Default");
 
-            Enum.TryParse(loggingLevelParam, out LogEventLevel loggingLevel);
+            var loggingLevelOk = Enum.TryParse(loggingLevelParam, out LogEventLevel loggingLevel);
+            if (!loggingLevelOk)
+                throw new Exception($"Logging level '{loggingLevelParam}' is not valid.");
+
             var loggingLevelSwitch = new LoggingLevelSwitch(loggingLevel);
 
             var columnOptions = new ColumnOptions();
             columnOptions.Store.Remove(StandardColumn.Properties);
             columnOptions.Store.Remove(StandardColumn.MessageTemplate);
             columnOptions.Store.Add(StandardColumn.LogEvent);
+
+            var mssqlSinkOptions = new MSSqlServerSinkOptions() { AutoCreateSqlTable = true, TableName = "__Logs" };
+
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.ControlledBy(loggingLevelSwitch)
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
                 .Enrich.FromLogContext()
                 .WriteTo.Console()
-                .WriteTo.MSSqlServer(connectionString, "__Logs", autoCreateSqlTable: true, columnOptions: columnOptions)
+                .WriteTo.MSSqlServer(connectionString, mssqlSinkOptions, columnOptions: columnOptions)
                 .CreateLogger();
 
             try