From 0f8b3c634708ce8e7b2e2ae6fed87b6b943b5bca Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Thu, 13 Dec 2018 14:18:25 +0100 Subject: Use Microsoft.Extensions.Logging abstraction --- MediaBrowser.Model/Logging/IConsoleLogger.cs | 7 -- MediaBrowser.Model/Logging/ILogManager.cs | 56 ---------------- MediaBrowser.Model/Logging/ILogger.cs | 78 ---------------------- MediaBrowser.Model/Logging/LogHelper.cs | 97 ---------------------------- MediaBrowser.Model/Logging/LogSeverity.cs | 30 --------- MediaBrowser.Model/Logging/NullLogger.cs | 44 ------------- 6 files changed, 312 deletions(-) delete mode 100644 MediaBrowser.Model/Logging/IConsoleLogger.cs delete mode 100644 MediaBrowser.Model/Logging/ILogManager.cs delete mode 100644 MediaBrowser.Model/Logging/ILogger.cs delete mode 100644 MediaBrowser.Model/Logging/LogHelper.cs delete mode 100644 MediaBrowser.Model/Logging/LogSeverity.cs delete mode 100644 MediaBrowser.Model/Logging/NullLogger.cs (limited to 'MediaBrowser.Model/Logging') diff --git a/MediaBrowser.Model/Logging/IConsoleLogger.cs b/MediaBrowser.Model/Logging/IConsoleLogger.cs deleted file mode 100644 index a8c282d65..000000000 --- a/MediaBrowser.Model/Logging/IConsoleLogger.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MediaBrowser.Model.Logging -{ - public interface IConsoleLogger - { - void WriteLine(string message); - } -} diff --git a/MediaBrowser.Model/Logging/ILogManager.cs b/MediaBrowser.Model/Logging/ILogManager.cs deleted file mode 100644 index e6a10cf18..000000000 --- a/MediaBrowser.Model/Logging/ILogManager.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace MediaBrowser.Model.Logging -{ - /// - /// Interface ILogManager - /// - public interface ILogManager - { - /// - /// Gets or sets the log level. - /// - /// The log level. - LogSeverity LogSeverity { get; set; } - - /// - /// Gets or sets the exception message prefix. - /// - /// The exception message prefix. - string ExceptionMessagePrefix { get; set; } - - /// - /// Gets the logger. - /// - /// The name. - /// ILogger. - ILogger GetLogger(string name); - - /// - /// Reloads the logger. - /// - Task ReloadLogger(LogSeverity severity, CancellationToken cancellationToken); - - /// - /// Occurs when [logger loaded]. - /// - event EventHandler LoggerLoaded; - - /// - /// Flushes this instance. - /// - void Flush(); - - /// - /// Adds the console output. - /// - void AddConsoleOutput(); - - /// - /// Removes the console output. - /// - void RemoveConsoleOutput(); - } -} diff --git a/MediaBrowser.Model/Logging/ILogger.cs b/MediaBrowser.Model/Logging/ILogger.cs deleted file mode 100644 index be9d6fc50..000000000 --- a/MediaBrowser.Model/Logging/ILogger.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - /// - /// Interface ILogger - /// - public interface ILogger - { - /// - /// Infoes the specified message. - /// - /// The message. - /// The param list. - void Info(string message, params object[] paramList); - - /// - /// Errors the specified message. - /// - /// The message. - /// The param list. - void Error(string message, params object[] paramList); - - /// - /// Warns the specified message. - /// - /// The message. - /// The param list. - void Warn(string message, params object[] paramList); - - /// - /// Debugs the specified message. - /// - /// The message. - /// The param list. - void Debug(string message, params object[] paramList); - - /// - /// Fatals the specified message. - /// - /// The message. - /// The param list. - void Fatal(string message, params object[] paramList); - - /// - /// Fatals the exception. - /// - /// The message. - /// The exception. - /// The param list. - void FatalException(string message, Exception exception, params object[] paramList); - - /// - /// Logs the exception. - /// - /// The message. - /// The exception. - /// The param list. - void ErrorException(string message, Exception exception, params object[] paramList); - - /// - /// Logs the multiline. - /// - /// The message. - /// The severity. - /// Content of the additional. - void LogMultiline(string message, LogSeverity severity, StringBuilder additionalContent); - - /// - /// Logs the specified severity. - /// - /// The severity. - /// The message. - /// The parameter list. - void Log(LogSeverity severity, string message, params object[] paramList); - } -} diff --git a/MediaBrowser.Model/Logging/LogHelper.cs b/MediaBrowser.Model/Logging/LogHelper.cs deleted file mode 100644 index cf1c02186..000000000 --- a/MediaBrowser.Model/Logging/LogHelper.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - /// - /// Class LogHelper - /// - public static class LogHelper - { - /// - /// Gets the log message. - /// - /// The exception. - /// StringBuilder. - public static StringBuilder GetLogMessage(Exception exception) - { - if (exception == null) - { - throw new ArgumentNullException("exception"); - } - - var messageText = new StringBuilder(); - - messageText.AppendLine(exception.ToString()); - - messageText.AppendLine(exception.GetType().FullName); - - LogExceptionData(messageText, exception); - - messageText.AppendLine(exception.StackTrace ?? "No Stack Trace Available"); - - // Log the InnerExceptions, if any - AppendInnerExceptions(messageText, exception); - - messageText.AppendLine(string.Empty); - - return messageText; - } - - /// - /// Appends the inner exceptions. - /// - /// The message text. - /// The e. - private static void AppendInnerExceptions(StringBuilder messageText, Exception e) - { - var aggregate = e as AggregateException; - - if (aggregate != null && aggregate.InnerExceptions != null) - { - foreach (var ex in aggregate.InnerExceptions) - { - AppendInnerException(messageText, ex); - AppendInnerExceptions(messageText, ex); - } - } - - else if (e.InnerException != null) - { - AppendInnerException(messageText, e.InnerException); - AppendInnerExceptions(messageText, e.InnerException); - } - } - - /// - /// Appends the inner exception. - /// - /// The message text. - /// The e. - private static void AppendInnerException(StringBuilder messageText, Exception e) - { - messageText.AppendLine("InnerException: " + e.GetType().FullName); - messageText.AppendLine(e.ToString()); - - LogExceptionData(messageText, e); - - if (e.StackTrace != null) - { - messageText.AppendLine(e.StackTrace); - } - } - - /// - /// Logs the exception data. - /// - /// The message text. - /// The e. - private static void LogExceptionData(StringBuilder messageText, Exception e) - { - foreach (var key in e.Data.Keys) - { - messageText.AppendLine(key + ": " + e.Data[key]); - } - } - } -} diff --git a/MediaBrowser.Model/Logging/LogSeverity.cs b/MediaBrowser.Model/Logging/LogSeverity.cs deleted file mode 100644 index ae0487289..000000000 --- a/MediaBrowser.Model/Logging/LogSeverity.cs +++ /dev/null @@ -1,30 +0,0 @@ - -namespace MediaBrowser.Model.Logging -{ - /// - /// Enum LogSeverity - /// - public enum LogSeverity - { - /// - /// The info - /// - Info, - /// - /// The debug - /// - Debug, - /// - /// The warn - /// - Warn, - /// - /// The error - /// - Error, - /// - /// The fatal - /// - Fatal - } -} diff --git a/MediaBrowser.Model/Logging/NullLogger.cs b/MediaBrowser.Model/Logging/NullLogger.cs deleted file mode 100644 index d211d2567..000000000 --- a/MediaBrowser.Model/Logging/NullLogger.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Text; - -namespace MediaBrowser.Model.Logging -{ - public class NullLogger : ILogger - { - public void Info(string message, params object[] paramList) - { - } - - public void Error(string message, params object[] paramList) - { - } - - public void Warn(string message, params object[] paramList) - { - } - - public void Debug(string message, params object[] paramList) - { - } - - public void Fatal(string message, params object[] paramList) - { - } - - public void FatalException(string message, Exception exception, params object[] paramList) - { - } - - public void Log(LogSeverity severity, string message, params object[] paramList) - { - } - - public void ErrorException(string message, Exception exception, params object[] paramList) - { - } - - public void LogMultiline(string message, LogSeverity severity, StringBuilder additionalContent) - { - } - } -} -- cgit v1.2.3