yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get logger to output as same file as old Log4Net and in same format (only diff currently is the log level type in the log file)

Browse Source 
Ensures we use the calling type in the Umbraco ILogger and passes it onto Serilog
This commit is contained in:
Warren
2018-07-30 16:36:38 +01:00
parent cf47fb99f2
commit cd2a70a520
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/Logging/Logger.cs
View File

@@ -1,14 +1,12 @@
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Web;
using Umbraco.Core.Configuration;
using Umbraco.Core.Diagnostics;
using Serilog;
using Serilog.Events;
namespace Umbraco.Core.Logging
{
@@ -37,7 +35,11 @@ namespace Umbraco.Core.Logging
.Enrich.WithThreadId()
.Enrich.WithProperty("AppDomainId", AppDomain.CurrentDomain.Id)
.Enrich.WithProperty("AppDomainAppId", HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty))
.WriteTo.File(AppDomain.CurrentDomain.BaseDirectory + "\\logs\\warren.txt", rollingInterval: RollingInterval.Day)
.WriteTo.File(AppDomain.CurrentDomain.BaseDirectory + @"\App_Data\Logs\UmbracoTraceLog.txt", //Our main app Logfile
rollingInterval: RollingInterval.Day,
restrictedToMinimumLevel: LogEventLevel.Debug,
retainedFileCountLimit: null, //Setting to null means we keep all files - default is 31 days
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss,fff} [P{ProcessId}/D{AppDomainId}/T{ThreadId}] {Level:u4} {Message:lj}{NewLine}{Exception}")
.CreateLogger();
}
@@ -146,14 +148,14 @@ namespace Umbraco.Core.Logging
public void Warn(Type reporting, Exception exception, string message)
{
var logger = Log.Logger;
logger?.Warning(message, exception);
logger?.ForContext(reporting).Warning(message, exception);
}
/// <inheritdoc/>
public void Warn(Type reporting, Exception exception, Func<string> messageBuilder)
{
var logger = Log.Logger;
logger?.Warning(messageBuilder(), exception);
logger?.ForContext(reporting).Warning(messageBuilder(), exception);
}
///// <inheritdoc/>
@@ -182,14 +184,14 @@ namespace Umbraco.Core.Logging
public void Info(Type reporting, string message)
{
var logger = Log.Logger;
logger?.Information(message);
logger?.ForContext(reporting).Information(message);
}
/// <inheritdoc/>
public void Info(Type reporting, Func<string> generateMessage)
{
var logger = Log.Logger;
logger?.Information(generateMessage());
logger?.ForContext(reporting).Information(generateMessage());
}
///// <inheritdoc/>
@@ -212,14 +214,14 @@ namespace Umbraco.Core.Logging
public void Debug(Type reporting, string message)
{
var logger = Log.Logger;
logger?.Debug(message);
logger?.ForContext(reporting).Debug(message);
}
/// <inheritdoc/>
public void Debug(Type reporting, Func<string> messageBuilder)
{
var logger = Log.Logger;
logger?.Debug(messageBuilder());
logger?.ForContext(reporting).Debug(messageBuilder());
}
///// <inheritdoc/>