mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-28 11:44:48 +03:00
Moved discovery of loggers and weather providers to MEF. Also added support for third-party image processors, also discovered through MEF.
This commit is contained in:
parent
01a25c48a0
commit
8b7effd6ff
@@ -1,24 +1,28 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using MediaBrowser.Common.Kernel;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
public static class Logger
|
||||
{
|
||||
public static BaseLogger LoggerInstance { get; set; }
|
||||
internal static IKernel Kernel { get; set; }
|
||||
|
||||
public static void LogInfo(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogInfo(message, paramList);
|
||||
LogEntry(message, LogSeverity.Info, paramList);
|
||||
}
|
||||
|
||||
public static void LogDebugInfo(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogDebugInfo(message, paramList);
|
||||
LogEntry(message, LogSeverity.Debug, paramList);
|
||||
}
|
||||
|
||||
public static void LogError(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogError(message, paramList);
|
||||
LogEntry(message, LogSeverity.Error, paramList);
|
||||
}
|
||||
|
||||
public static void LogException(Exception ex, params object[] paramList)
|
||||
@@ -28,12 +32,62 @@ namespace MediaBrowser.Common.Logging
|
||||
|
||||
public static void LogException(string message, Exception ex, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogException(message, ex, paramList);
|
||||
var builder = new StringBuilder();
|
||||
|
||||
if (ex != null)
|
||||
{
|
||||
builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}",
|
||||
ex.GetType().FullName,
|
||||
ex.Message,
|
||||
ex.StackTrace,
|
||||
Environment.NewLine);
|
||||
}
|
||||
|
||||
message = FormatMessage(message, paramList);
|
||||
|
||||
LogError(string.Format("{0} ( {1} )", message, builder));
|
||||
}
|
||||
|
||||
public static void LogWarning(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogWarning(message, paramList);
|
||||
LogEntry(message, LogSeverity.Warning, paramList);
|
||||
}
|
||||
|
||||
private static void LogEntry(string message, LogSeverity severity, params object[] paramList)
|
||||
{
|
||||
message = FormatMessage(message, paramList);
|
||||
|
||||
Thread currentThread = Thread.CurrentThread;
|
||||
|
||||
var row = new LogRow
|
||||
{
|
||||
Severity = severity,
|
||||
Message = message,
|
||||
ThreadId = currentThread.ManagedThreadId,
|
||||
ThreadName = currentThread.Name,
|
||||
Time = DateTime.Now
|
||||
};
|
||||
|
||||
if (Kernel.Loggers != null)
|
||||
{
|
||||
foreach (var logger in Kernel.Loggers)
|
||||
{
|
||||
logger.LogEntry(row);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static string FormatMessage(string message, params object[] paramList)
|
||||
{
|
||||
if (paramList != null)
|
||||
{
|
||||
for (int i = 0; i < paramList.Length; i++)
|
||||
{
|
||||
message = message.Replace("{" + i + "}", paramList[i].ToString());
|
||||
}
|
||||
}
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user