Merge pull request #37 from akkadotnet/dev

Akka.Logger.Serilog v1.3.0 release

Author: Danthar

README.md

@@ -1,6 +1,6 @@
 #### Akka.Logger.Serilog ####
 
-This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/docs/Serilog) on how to get the most out of this plugin.
+This is the Serilog integration plugin for Akka.NET. Please check out our [documentation](http://getakka.net/articles/utilities/serilog.html) on how to get the most out of this plugin.
 
-Targets Serilog 2.4.0
+Targets Serilog 2.6.0
 

RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+#### 1.3.0 January 27 2018 ####
+
+Removed SerilogLogMessageFormatter since its no longer needed
+Support for Akka 1.3.3
+Update to Serilog 2.6.0
+
 #### 1.2.0 April 18 2017 ####
 
 Support for Akka 1.2.0

src/Akka.Logger.Serilog.sln

@@ -1,16 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Logger.Serilog", "Akka.Logger.Serilog\Akka.Logger.Serilog.csproj", "{53D9D2F0-4A35-4FCE-980C-8F7F3DCBDB2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Logger.Serilog", "Akka.Logger.Serilog\Akka.Logger.Serilog.csproj", "{53D9D2F0-4A35-4FCE-980C-8F7F3DCBDB2B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BA416AC7-E51E-48C2-B74F-FAC3506A811C}"
 	ProjectSection(SolutionItems) = preProject
 		..\build.fsx = ..\build.fsx
 		..\README.md = ..\README.md
 		..\RELEASE_NOTES.md = ..\RELEASE_NOTES.md
-		SharedAssemblyInfo.cs = SharedAssemblyInfo.cs
 	EndProjectSection
 EndProject
 Global
@@ -27,4 +26,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9CD3DD63-AFFE-499F-B7EA-29D7A39F4243}
+	EndGlobalSection
 EndGlobal

src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Akka" Version="1.3.0" />
-    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog" Version="2.6.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/Akka.Logger.Serilog/MessageTemplateCache.cs

@@ -27,7 +27,7 @@ public class SerilogLogger : ReceiveActor, IRequiresMessageQueue<ILoggerMessageQ
         private static string GetFormat(object message)
         {
             var logMessage = message as LogMessage;
-            return logMessage != null ? logMessage.Format : "{Message}";
+            return logMessage != null ? logMessage.Format : "{Message:l}";
         }
 
         private static object[] GetArgs(object message)

src/Akka.Logger.Serilog/SerilogLogMessageFormatter.cs

@@ -9,12 +9,27 @@ namespace Akka.Logger.Serilog
 {
     public class SerilogLoggingAdapter : ILoggingAdapter
     {
+        /// <summary>
+        /// Helper class that allows context trees.
+        /// </summary>
+        private class ContextNode
+        {
+            public ContextNode Next { get; set; }
+            public ILogEventEnricher Enricher { get; set; }
+        }
+
         private readonly ILoggingAdapter adapter;
-        private readonly IDictionary<string, ILogEventEnricher> enrichers = new Dictionary<string, ILogEventEnricher>();
+        private readonly ContextNode enricherNode;
 
         public SerilogLoggingAdapter(ILoggingAdapter adapter)
+            : this(adapter, null)
+        {
+        }
+
+        private SerilogLoggingAdapter(ILoggingAdapter adapter, ContextNode enricherNode)
         {
             this.adapter = adapter;
+            this.enricherNode = enricherNode;
         }
 
         /// <summary>
@@ -117,14 +132,29 @@ public virtual void Log(LogLevel logLevel, string format, params object[] args)
 
         public ILoggingAdapter SetContextProperty(string name, object value, bool destructureObjects = false)
         {
-            enrichers.Add(name, new PropertyEnricher(name, value, destructureObjects));
-            return this;
+            var contextProperty = new PropertyEnricher(name, value, destructureObjects);
+
+            var contextNode = new ContextNode
+            {
+                Enricher = contextProperty,
+                Next = enricherNode
+            };
+
+            return new SerilogLoggingAdapter(adapter, contextNode);
         }
 
         private object[] BuildArgs(IEnumerable<object> args)
         {
             var newArgs = args.ToList();
-            newArgs.AddRange(enrichers.Select(enricher => enricher.Value));
+            if (enricherNode != null)
+            {
+                var currentNode = enricherNode;
+                while (currentNode != null)
+                {
+                    newArgs.Add(currentNode.Enricher);
+                    currentNode = currentNode.Next;
+                }
+            }
             return newArgs.ToArray();
         }
     }

src/Akka.Logger.Serilog/SerilogLogger.cs

@@ -30,7 +30,7 @@ public static ILoggingAdapter GetLogger<T>(this IActorContext context)
             var logSource = context.Self.ToString();
             var logClass = context.Props.Type;
 
-            return Activator.CreateInstance(typeof(T), new BusLogging(context.System.EventStream, logSource, logClass, new SerilogLogMessageFormatter())) as T;
+            return Activator.CreateInstance(typeof(T), new BusLogging(context.System.EventStream, logSource, logClass, new DefaultLogMessageFormatter())) as T;
         }
     }
 }