Merge pull request #269 from ckadluba/remove-duplicate-code-config-ext

Remove duplicate code in config extensions

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/Hybrid/LoggerConfigurationMSSqlServerExtensions.cs

@@ -156,34 +156,8 @@ internal static LoggerConfiguration MSSqlServerInternal(
             if (loggerConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerConfiguration));
 
-            sinkOptions = sinkOptions ?? new SinkOptions();
-            columnOptions = columnOptions ?? new ColumnOptions();
-
-            var serviceConfigSection = applySystemConfiguration.GetSinkConfigurationSection(AppConfigSectionName);
-            if (serviceConfigSection != null)
-            {
-                connectionString = applySystemConfiguration.GetConnectionString(connectionString);
-                columnOptions = applySystemConfiguration.ConfigureColumnOptions(serviceConfigSection, columnOptions);
-                sinkOptions = applySystemConfiguration.ConfigureSinkOptions(serviceConfigSection, sinkOptions);
-
-                if (appConfiguration != null || columnOptionsSection != null || sinkOptionsSection != null)
-                    SelfLog.WriteLine("Warning: Both System.Configuration (app.config or web.config) and Microsoft.Extensions.Configuration are being applied to the MSSQLServer sink.");
-            }
-
-            if (appConfiguration != null)
-            {
-                connectionString = applyMicrosoftExtensionsConfiguration.GetConnectionString(connectionString, appConfiguration);
-            }
-
-            if (columnOptionsSection != null)
-            {
-                columnOptions = applyMicrosoftExtensionsConfiguration.ConfigureColumnOptions(columnOptions, columnOptionsSection);
-            }
-
-            if (sinkOptionsSection != null)
-            {
-                sinkOptions = applyMicrosoftExtensionsConfiguration.ConfigureSinkOptions(sinkOptions, sinkOptionsSection);
-            }
+            ReadConfiguration(ref connectionString, ref sinkOptions, sinkOptionsSection, appConfiguration,
+                ref columnOptions, columnOptionsSection, applySystemConfiguration, applyMicrosoftExtensionsConfiguration);
 
             var sink = sinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
 
@@ -298,6 +272,24 @@ internal static LoggerConfiguration MSSqlServerInternal(
             if (loggerAuditSinkConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerAuditSinkConfiguration));
 
+            ReadConfiguration(ref connectionString, ref sinkOptions, sinkOptionsSection, appConfiguration,
+                ref columnOptions, columnOptionsSection, applySystemConfiguration, applyMicrosoftExtensionsConfiguration);
+
+            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
+
+            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
+        }
+
+        private static void ReadConfiguration(
+            ref string connectionString,
+            ref SinkOptions sinkOptions,
+            IConfigurationSection sinkOptionsSection,
+            IConfiguration appConfiguration,
+            ref ColumnOptions columnOptions,
+            IConfigurationSection columnOptionsSection,
+            IApplySystemConfiguration applySystemConfiguration,
+            IApplyMicrosoftExtensionsConfiguration applyMicrosoftExtensionsConfiguration)
+        {
             sinkOptions = sinkOptions ?? new SinkOptions();
             columnOptions = columnOptions ?? new ColumnOptions();
 
@@ -326,10 +318,6 @@ internal static LoggerConfiguration MSSqlServerInternal(
             {
                 sinkOptions = applyMicrosoftExtensionsConfiguration.ConfigureSinkOptions(sinkOptions, sinkOptionsSection);
             }
-
-            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
-
-            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
         }
     }
 }

src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/Microsoft.Extensions.Configuration/LoggerConfigurationMSSqlServerExtensions.cs

@@ -119,13 +119,8 @@ public static LoggerConfiguration MSSqlServer(
             if (loggerConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerConfiguration));
 
-            sinkOptions = sinkOptions ?? new SinkOptions();
-            columnOptions = columnOptions ?? new ColumnOptions();
-
-            IApplyMicrosoftExtensionsConfiguration microsoftExtensionsConfiguration = new ApplyMicrosoftExtensionsConfiguration();
-            connectionString = microsoftExtensionsConfiguration.GetConnectionString(connectionString, appConfiguration);
-            columnOptions = microsoftExtensionsConfiguration.ConfigureColumnOptions(columnOptions, columnOptionsSection);
-            sinkOptions = microsoftExtensionsConfiguration.ConfigureSinkOptions(sinkOptions, sinkOptionsSection);
+            ReadConfiguration(ref connectionString, ref sinkOptions, appConfiguration, ref columnOptions,
+                columnOptionsSection, sinkOptionsSection);
 
             IMSSqlServerSinkFactory sinkFactory = new MSSqlServerSinkFactory();
             var sink = sinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
@@ -212,18 +207,30 @@ public static LoggerConfiguration MSSqlServer(
             if (loggerAuditSinkConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerAuditSinkConfiguration));
 
+            ReadConfiguration(ref connectionString, ref sinkOptions, appConfiguration, ref columnOptions,
+                columnOptionsSection, sinkOptionsSection);
+
+            IMSSqlServerAuditSinkFactory auditSinkFactory = new MSSqlServerAuditSinkFactory();
+            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
+
+            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
+        }
+
+        private static void ReadConfiguration(
+            ref string connectionString,
+            ref SinkOptions sinkOptions,
+            IConfiguration appConfiguration,
+            ref ColumnOptions columnOptions,
+            IConfigurationSection columnOptionsSection,
+            IConfigurationSection sinkOptionsSection)
+        {
             sinkOptions = sinkOptions ?? new SinkOptions();
             columnOptions = columnOptions ?? new ColumnOptions();
 
             IApplyMicrosoftExtensionsConfiguration microsoftExtensionsConfiguration = new ApplyMicrosoftExtensionsConfiguration();
             connectionString = microsoftExtensionsConfiguration.GetConnectionString(connectionString, appConfiguration);
             columnOptions = microsoftExtensionsConfiguration.ConfigureColumnOptions(columnOptions, columnOptionsSection);
             sinkOptions = microsoftExtensionsConfiguration.ConfigureSinkOptions(sinkOptions, sinkOptionsSection);
-
-            IMSSqlServerAuditSinkFactory auditSinkFactory = new MSSqlServerAuditSinkFactory();
-            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
-
-            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
         }
     }
 }

src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/System.Configuration/LoggerConfigurationMSSqlServerExtensions.cs

@@ -133,17 +133,7 @@ internal static LoggerConfiguration MSSqlServerInternal(
             if (loggerConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerConfiguration));
 
-            sinkOptions = sinkOptions ?? new SinkOptions();
-            columnOptions = columnOptions ?? new ColumnOptions();
-
-            var serviceConfigSection = applySystemConfiguration.GetSinkConfigurationSection(configSectionName);
-            if (serviceConfigSection != null)
-            {
-                columnOptions = applySystemConfiguration.ConfigureColumnOptions(serviceConfigSection, columnOptions);
-                sinkOptions = applySystemConfiguration.ConfigureSinkOptions(serviceConfigSection, sinkOptions);
-            }
-
-            connectionString = applySystemConfiguration.GetConnectionString(connectionString);
+            ReadConfiguration(configSectionName, ref connectionString, ref sinkOptions, ref columnOptions, applySystemConfiguration);
 
             var sink = sinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
 
@@ -245,8 +235,22 @@ internal static LoggerConfiguration MSSqlServerInternal(
             if (loggerAuditSinkConfiguration == null)
                 throw new ArgumentNullException(nameof(loggerAuditSinkConfiguration));
 
-            columnOptions = columnOptions ?? new ColumnOptions();
+            ReadConfiguration(configSectionName, ref connectionString, ref sinkOptions, ref columnOptions, applySystemConfiguration);
+
+            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
+
+            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
+        }
+
+        private static void ReadConfiguration(
+            string configSectionName,
+            ref string connectionString,
+            ref SinkOptions sinkOptions,
+            ref ColumnOptions columnOptions,
+            IApplySystemConfiguration applySystemConfiguration)
+        {
             sinkOptions = sinkOptions ?? new SinkOptions();
+            columnOptions = columnOptions ?? new ColumnOptions();
 
             var serviceConfigSection = applySystemConfiguration.GetSinkConfigurationSection(configSectionName);
             if (serviceConfigSection != null)
@@ -256,10 +260,6 @@ internal static LoggerConfiguration MSSqlServerInternal(
             }
 
             connectionString = applySystemConfiguration.GetConnectionString(connectionString);
-
-            var auditSink = auditSinkFactory.Create(connectionString, sinkOptions, formatProvider, columnOptions, logEventFormatter);
-
-            return loggerAuditSinkConfiguration.Sink(auditSink, restrictedToMinimumLevel);
         }
     }
 }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerAuditSink.cs

@@ -73,7 +73,7 @@ public MSSqlServerAuditSink(
         public MSSqlServerAuditSink(
             string connectionString,
             SinkOptions sinkOptions,
-            IFormatProvider formatProvider,
+            IFormatProvider formatProvider = null,
             ColumnOptions columnOptions = null,
             ITextFormatter logEventFormatter = null)
         {

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

@@ -94,7 +94,7 @@ public MSSqlServerSink(
         public MSSqlServerSink(
             string connectionString,
             SinkOptions sinkOptions,
-            IFormatProvider formatProvider,
+            IFormatProvider formatProvider = null,
             ColumnOptions columnOptions = null,
             ITextFormatter logEventFormatter = null)
             : base(sinkOptions?.BatchPostingLimit ?? DefaultBatchPostingLimit, sinkOptions?.BatchPeriod ?? DefaultPeriod)