Merge branch 'dev' into formatter-exceptions

Author: Sergey Komisarchik

serilog-extensions-logging.sln.DotSettings

@@ -8,4 +8,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Loggable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nonscalar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=sobj/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sobj/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stringification/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs

@@ -9,6 +9,7 @@
 using Serilog.Events;
 using FrameworkLogger = Microsoft.Extensions.Logging.ILogger;
 using System.Reflection;
+using Serilog.Debugging;
 
 namespace Serilog.Extensions.Logging
 {
@@ -59,6 +60,18 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 return;
             }
 
+            try
+            {
+                Write(level, eventId, state, exception, formatter);
+            }
+            catch (Exception ex)
+            {
+                SelfLog.WriteLine($"Failed to write event through {typeof(SerilogLogger).Name}: {ex}");
+            }
+        }
+
+        void Write<TState>(LogEventLevel level, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
             var logger = _logger;
             string messageTemplate = null;
 

test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs

@@ -167,7 +167,7 @@ public void StringifyScopeProperty()
         {
             var (logger, sink) = SetUp(LogLevel.Trace);
 
-            using (logger.BeginScope("{$values}", new int[] { 1, 2, 3, 4 }))
+            using (logger.BeginScope("{$values}", new [] { 1, 2, 3, 4 }))
             {
                 logger.Log(LogLevel.Information, 0, TestMessage, null, null);
             }
@@ -272,6 +272,7 @@ public void CarriesEventIdIfNonzero()
         public void WhenDisposeIsFalseProvidedLoggerIsNotDisposed()
         {
             var logger = new DisposeTrackingLogger();
+            // ReSharper disable once RedundantArgumentDefaultValue
             var provider = new SerilogLoggerProvider(logger, false);
             provider.Dispose();
             Assert.False(logger.IsDisposed);
@@ -439,5 +440,15 @@ public void LowAndHighNumberedEventIdsAreMapped(int id)
             var scalar = Assert.IsType<ScalarValue>(idValue);
             Assert.Equal(id, scalar.Value);
         }
+        
+        [Fact]
+        public void MismatchedMessageTemplateParameterCountIsHandled()
+        {
+            var (logger, sink) = SetUp(LogLevel.Trace);
+
+            logger.LogInformation("Some test message with {Two} {Properties}", "OneProperty");
+
+            Assert.Equal(0, sink.Writes.Count);
+        }
     }
 }