From b774330e4fa710b020c7a2b832f5fd6c553468c7 Mon Sep 17 00:00:00 2001 From: Warren Date: Fri, 27 Jul 2018 15:49:40 +0100 Subject: [PATCH] Updates Logger class to implement & call Serilog methods as opposed to Log4Net Unsure about the methods that take in args - have commented these out for now (Need to talk with Seb or Stephan about this) --- src/Umbraco.Core/Logging/Logger.cs | 164 ++++++++++++++--------------- 1 file changed, 78 insertions(+), 86 deletions(-) diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs index d3295c461d..8fe6053a2c 100644 --- a/src/Umbraco.Core/Logging/Logger.cs +++ b/src/Umbraco.Core/Logging/Logger.cs @@ -52,7 +52,7 @@ namespace Umbraco.Core.Logging /// public void Error(Type reporting, string message, Exception exception = null) { - var logger = LogManager.GetLogger(reporting); + var logger = Log.Logger; if (logger == null) return; var dump = false; @@ -114,135 +114,127 @@ namespace Umbraco.Core.Logging /// public void Warn(Type reporting, string format) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.Warn(format); + var logger = Log.Logger; + logger?.Warning(format); } /// public void Warn(Type reporting, Func messageBuilder) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.Warn(messageBuilder()); + var logger = Log.Logger; + logger?.Warning(messageBuilder()); } /// - public void Warn(Type reporting, string format, params object[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.WarnFormat(format, args); - } + //public void Warn(Type reporting, string format, params object[] args) + //{ + // var logger = Log.Logger; + // if (logger == null) return; + // logger.WarnFormat(format, args); + //} - /// - public void Warn(Type reporting, string format, params Func[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.WarnFormat(format, args.Select(x => x.Invoke()).ToArray()); - } + ///// + //public void Warn(Type reporting, string format, params Func[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsWarnEnabled == false) return; + // logger.WarnFormat(format, args.Select(x => x.Invoke()).ToArray()); + //} /// public void Warn(Type reporting, Exception exception, string message) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.Warn(message, exception); + var logger = Log.Logger; + logger?.Warning(message, exception); } /// public void Warn(Type reporting, Exception exception, Func messageBuilder) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - logger.Warn(messageBuilder(), exception); + var logger = Log.Logger; + logger?.Warning(messageBuilder(), exception); } - /// - public void Warn(Type reporting, Exception exception, string format, params object[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - // there is no WarnFormat overload that accepts an exception - // format the message the way log4net would do it (see source code LogImpl.cs) - var message = new SystemStringFormat(CultureInfo.InvariantCulture, format, args); - logger.Warn(message, exception); - } + ///// + //public void Warn(Type reporting, Exception exception, string format, params object[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsWarnEnabled == false) return; + // // there is no WarnFormat overload that accepts an exception + // // format the message the way log4net would do it (see source code LogImpl.cs) + // var message = new SystemStringFormat(CultureInfo.InvariantCulture, format, args); + // logger.Warn(message, exception); + //} - /// - public void Warn(Type reporting, Exception exception, string format, params Func[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsWarnEnabled == false) return; - // there is no WarnFormat overload that accepts an exception - // format the message the way log4net would do it (see source code LogImpl.cs) - var message = new SystemStringFormat(CultureInfo.InvariantCulture, format, args.Select(x => x.Invoke()).ToArray()); - logger.Warn(message, exception); - } + ///// + //public void Warn(Type reporting, Exception exception, string format, params Func[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsWarnEnabled == false) return; + // // there is no WarnFormat overload that accepts an exception + // // format the message the way log4net would do it (see source code LogImpl.cs) + // var message = new SystemStringFormat(CultureInfo.InvariantCulture, format, args.Select(x => x.Invoke()).ToArray()); + // logger.Warn(message, exception); + //} /// public void Info(Type reporting, string message) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsInfoEnabled == false) return; - logger.Info(message); + var logger = Log.Logger; + logger?.Information(message); } /// public void Info(Type reporting, Func generateMessage) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsInfoEnabled == false) return; - logger.Info(generateMessage()); + var logger = Log.Logger; + logger?.Information(generateMessage()); } - /// - public void Info(Type reporting, string format, params object[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsInfoEnabled == false) return; - logger.InfoFormat(format, args); - } + ///// + //public void Info(Type reporting, string format, params object[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsInfoEnabled == false) return; + // logger.InfoFormat(format, args); + //} - /// - public void Info(Type reporting, string format, params Func[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsInfoEnabled == false) return; - logger.InfoFormat(format, args.Select(x => x.Invoke()).ToArray()); - } + ///// + //public void Info(Type reporting, string format, params Func[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsInfoEnabled == false) return; + // logger.InfoFormat(format, args.Select(x => x.Invoke()).ToArray()); + //} /// public void Debug(Type reporting, string message) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsDebugEnabled == false) return; - logger.Debug(message); + var logger = Log.Logger; + logger?.Debug(message); } /// public void Debug(Type reporting, Func messageBuilder) { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsDebugEnabled == false) return; - logger.Debug(messageBuilder()); + var logger = Log.Logger; + logger?.Debug(messageBuilder()); } - /// - public void Debug(Type reporting, string format, params object[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsDebugEnabled == false) return; - logger.DebugFormat(format, args); - } + ///// + //public void Debug(Type reporting, string format, params object[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsDebugEnabled == false) return; + // logger.DebugFormat(format, args); + //} - /// - public void Debug(Type reporting, string format, params Func[] args) - { - var logger = LogManager.GetLogger(reporting); - if (logger == null || logger.IsDebugEnabled == false) return; - logger.DebugFormat(format, args.Select(x => x.Invoke()).ToArray()); - } + ///// + //public void Debug(Type reporting, string format, params Func[] args) + //{ + // var logger = LogManager.GetLogger(reporting); + // if (logger == null || logger.IsDebugEnabled == false) return; + // logger.DebugFormat(format, args.Select(x => x.Invoke()).ToArray()); + //} } }