From f6d81f397da784429fb67d883bc39f6dbd41af40 Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Fri, 27 Jul 2018 15:35:08 +0100
Subject: [PATCH] Adds in Serilog & configures it to add in enrichers from the
 Nuget package & a custom one for the AppDomainAppId

---
 src/Umbraco.Core/Logging/Logger.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs
index b367347f06..d3295c461d 100644
--- a/src/Umbraco.Core/Logging/Logger.cs
+++ b/src/Umbraco.Core/Logging/Logger.cs
@@ -5,11 +5,10 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using log4net;
-using log4net.Config;
+using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Diagnostics;
-using log4net.Util;
+using Serilog;
 
 namespace Umbraco.Core.Logging
 {
@@ -25,15 +24,20 @@ namespace Umbraco.Core.Logging
         public Logger(FileInfo log4NetConfigFile)
             : this()
         {
-            XmlConfigurator.Configure(log4NetConfigFile);
+            //XmlConfigurator.Configure(log4NetConfigFile);
         }
 
         // private for CreateWithDefaultConfiguration
         private Logger()
         {
-            // add custom global properties to the log4net context that we can use in our logging output
-            GlobalContext.Properties["processId"] = Process.GetCurrentProcess().Id;
-            GlobalContext.Properties["appDomainId"] = AppDomain.CurrentDomain.Id;
+            Log.Logger = new LoggerConfiguration()
+                .MinimumLevel.Debug() //Set to highest level of logging (as any sinks may want to restrict it to Errors only)
+                .Enrich.WithProcessId()
+                .Enrich.WithProcessName()
+                .Enrich.WithThreadId()
+                .Enrich.WithProperty("AppDomainId", AppDomain.CurrentDomain.Id)
+                .Enrich.WithProperty("AppDomainAppId", HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty))
+                .CreateLogger();
         }
 
         /// <summary>