Add SerilogFactory constructor with custom logger

mythz · mythz · commit 4c8701a22972 · 2018-08-09T20:02:11.000-04:00
diff --git a/src/ServiceStack.Logging.Serilog/SerilogFactory.cs b/src/ServiceStack.Logging.Serilog/SerilogFactory.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using Serilog;
 
 namespace ServiceStack.Logging.Serilog
 {
@@ -7,14 +8,28 @@ namespace ServiceStack.Logging.Serilog
     /// </summary>
     public class SerilogFactory : ILogFactory
     {
+        private readonly ILogger logger;
+
+        public SerilogFactory() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SerilogFactory"/> class.
+        /// </summary>
+        public SerilogFactory(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         /// <summary>
         /// Gets the logger.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns></returns>
         public ILog GetLogger(Type type)
         {
-            return new SerilogLogger(type);
+            return logger != null
+                ? new SerilogLogger(logger.ForContext(type))
+                : new SerilogLogger(type);
         }
 
         /// <summary>
@@ -24,7 +39,7 @@ public ILog GetLogger(Type type)
         /// <returns></returns>
         public ILog GetLogger(string typeName)
         {
-            return new SerilogLogger(Type.GetType(typeName));
+            return GetLogger(Type.GetType(typeName));
         }
     }
 }
diff --git a/tests/ServiceStack.Common.Tests/Messaging/MqServerAppHostTests.cs b/tests/ServiceStack.Common.Tests/Messaging/MqServerAppHostTests.cs
@@ -164,7 +164,7 @@ public void Any(ThrowVoid request)
         }
     }
 
-    public class MqTestsAppHost : AppHostHttpListenerBase
+    public class MqTestsAppHost : AppSelfHostBase
     {
         private readonly Func<IMessageService> createMqServerFn;
 
diff --git a/tests/ServiceStack.Logging.Tests/UseCases/UsingSerilog.cs b/tests/ServiceStack.Logging.Tests/UseCases/UsingSerilog.cs
@@ -1,15 +1,18 @@
-﻿using NUnit.Framework;
+﻿using System;
+using NUnit.Framework;
+using Serilog;
+using Serilog.Configuration;
+using Serilog.Core;
+using Serilog.Events;
 using ServiceStack.Logging.Serilog;
 
 namespace ServiceStack.Logging.Tests.UseCases
 {
     [TestFixture]
     public class UsingSerilog
     {
-        [Test]
-        public void SerilogUseCase()
+        private void TestLog()
         {
-            LogManager.LogFactory = new SerilogFactory();
             var log = LogManager.GetLogger(GetType());
 
             log.Debug("Debug Event Log Entry.");
@@ -18,5 +21,50 @@ public void SerilogUseCase()
             log.Error("Error Event Log Entry.");
             log.Fatal("Fatal Event Log Entry.");
         }
+
+        [Test]
+        public void Use_default_SerilogFactory()
+        {
+            LogManager.LogFactory = new SerilogFactory();
+            TestLog();
+        }
+
+
+
+        [Test]
+        public void Use_Serilog_with_custom_configuration_and_sink()
+        {
+            LogManager.LogFactory = new SerilogFactory(new LoggerConfiguration()
+                .WriteTo.MySink()
+                .CreateLogger());
+
+            TestLog();
+        }
+    }
+
+    public class MySink : ILogEventSink
+    {
+        private readonly IFormatProvider formatProvider;
+
+        public MySink(IFormatProvider formatProvider)
+        {
+            this.formatProvider = formatProvider;
+        }
+
+        public void Emit(LogEvent logEvent)
+        {
+            var message = logEvent.RenderMessage(formatProvider);
+            Console.WriteLine(DateTimeOffset.Now + " " + message);
+        }
+    }
+
+    public static class MySinkExtensions
+    {
+        public static LoggerConfiguration MySink(
+            this LoggerSinkConfiguration loggerConfiguration,
+            IFormatProvider formatProvider = null)
+        {
+            return loggerConfiguration.Sink(new MySink(formatProvider));
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using Serilog;`
`2`	`3`
`3`	`4`	`namespace ServiceStack.Logging.Serilog`
`4`	`5`	`{`
`@@ -7,14 +8,28 @@ namespace ServiceStack.Logging.Serilog`
`7`	`8`	`/// </summary>`
`8`	`9`	`public class SerilogFactory : ILogFactory`
`9`	`10`	`{`
	`11`	`+ private readonly ILogger logger;`
	`12`	`+`
	`13`	`+ public SerilogFactory() {}`
	`14`	`+`
	`15`	`+ /// <summary>`
	`16`	`+ /// Initializes a new instance of the <see cref="SerilogFactory"/> class.`
	`17`	`+ /// </summary>`
	`18`	`+ public SerilogFactory(ILogger logger)`
	`19`	`+ {`
	`20`	`+ this.logger = logger;`
	`21`	`+ }`
	`22`	`+`
`10`	`23`	`/// <summary>`
`11`	`24`	`/// Gets the logger.`
`12`	`25`	`/// </summary>`
`13`	`26`	`/// <param name="type">The type.</param>`
`14`	`27`	`/// <returns></returns>`
`15`	`28`	`public ILog GetLogger(Type type)`
`16`	`29`	`{`
`17`		`- return new SerilogLogger(type);`
	`30`	`+ return logger != null`
	`31`	`+ ? new SerilogLogger(logger.ForContext(type))`
	`32`	`+ : new SerilogLogger(type);`
`18`	`33`	`}`
`19`	`34`
`20`	`35`	`/// <summary>`
`@@ -24,7 +39,7 @@ public ILog GetLogger(Type type)`
`24`	`39`	`/// <returns></returns>`
`25`	`40`	`public ILog GetLogger(string typeName)`
`26`	`41`	`{`
`27`		`- return new SerilogLogger(Type.GetType(typeName));`
	`42`	`+ return GetLogger(Type.GetType(typeName));`
`28`	`43`	`}`
`29`	`44`	`}`
`30`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void Any(ThrowVoid request)`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`		`- public class MqTestsAppHost : AppHostHttpListenerBase`
	`167`	`+ public class MqTestsAppHost : AppSelfHostBase`
`168`	`168`	`{`
`169`	`169`	`private readonly Func<IMessageService> createMqServerFn;`
`170`	`170`