mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-06-18 21:50:25 +01:00
Fixed some project fragmentation that came from efforts to go portable
This commit is contained in:
parent
7d48e20aea
commit
d4c75e3974
76
MediaBrowser.Common/Logging/BaseLogger.cs
Normal file
76
MediaBrowser.Common/Logging/BaseLogger.cs
Normal file
@@ -0,0 +1,76 @@
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
public abstract class BaseLogger : IDisposable
|
||||
{
|
||||
public LogSeverity LogSeverity { get; set; }
|
||||
|
||||
public void LogInfo(string message, params object[] paramList)
|
||||
{
|
||||
LogEntry(message, LogSeverity.Info, paramList);
|
||||
}
|
||||
|
||||
public void LogDebugInfo(string message, params object[] paramList)
|
||||
{
|
||||
LogEntry(message, LogSeverity.Debug, paramList);
|
||||
}
|
||||
|
||||
public void LogError(string message, params object[] paramList)
|
||||
{
|
||||
LogEntry(message, LogSeverity.Error, paramList);
|
||||
}
|
||||
|
||||
public void LogException(string message, Exception exception, params object[] paramList)
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
||||
if (exception != null)
|
||||
{
|
||||
builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}",
|
||||
exception.GetType().FullName,
|
||||
exception.Message,
|
||||
exception.StackTrace,
|
||||
Environment.NewLine);
|
||||
}
|
||||
|
||||
message = string.Format(message, paramList);
|
||||
|
||||
LogError(string.Format("{0} ( {1} )", message, builder));
|
||||
}
|
||||
|
||||
public void LogWarning(string message, params object[] paramList)
|
||||
{
|
||||
LogEntry(message, LogSeverity.Warning, paramList);
|
||||
}
|
||||
|
||||
private void LogEntry(string message, LogSeverity severity, params object[] paramList)
|
||||
{
|
||||
if (severity < LogSeverity) return;
|
||||
|
||||
message = string.Format(message, paramList);
|
||||
|
||||
Thread currentThread = Thread.CurrentThread;
|
||||
|
||||
LogRow row = new LogRow()
|
||||
{
|
||||
Severity = severity,
|
||||
Message = message,
|
||||
Category = string.Empty,
|
||||
ThreadId = currentThread.ManagedThreadId,
|
||||
//ThreadName = currentThread.Name,
|
||||
Time = DateTime.Now
|
||||
};
|
||||
|
||||
LogEntry(row);
|
||||
}
|
||||
|
||||
public virtual void Dispose()
|
||||
{
|
||||
}
|
||||
|
||||
protected abstract void LogEntry(LogRow row);
|
||||
}
|
||||
}
|
||||
40
MediaBrowser.Common/Logging/LogRow.cs
Normal file
40
MediaBrowser.Common/Logging/LogRow.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
using System;
|
||||
using System.Text;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
public struct LogRow
|
||||
{
|
||||
const string TimePattern = "h:mm:ss.fff tt d/M/yyyy";
|
||||
|
||||
public LogSeverity Severity { get; set; }
|
||||
public string Message { get; set; }
|
||||
public string Category { get; set; }
|
||||
public int ThreadId { get; set; }
|
||||
public string ThreadName { get; set; }
|
||||
public DateTime Time { get; set; }
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
builder.Append(Time.ToString(TimePattern))
|
||||
.Append(" , ")
|
||||
.Append(Enum.GetName(typeof(LogSeverity), Severity))
|
||||
.Append(" , ")
|
||||
.Append(Encode(Message))
|
||||
.Append(" , ")
|
||||
.Append(Encode(Category))
|
||||
.Append(" , ")
|
||||
.Append(ThreadId)
|
||||
.Append(" , ")
|
||||
.Append(Encode(ThreadName));
|
||||
|
||||
return builder.ToString();
|
||||
}
|
||||
|
||||
private string Encode(string str)
|
||||
{
|
||||
return (str ?? "").Replace(",", ",,").Replace(Environment.NewLine, " [n] ");
|
||||
}
|
||||
}
|
||||
}
|
||||
14
MediaBrowser.Common/Logging/LogSeverity.cs
Normal file
14
MediaBrowser.Common/Logging/LogSeverity.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
[Flags]
|
||||
public enum LogSeverity
|
||||
{
|
||||
None = 0,
|
||||
Debug = 1,
|
||||
Info = 2,
|
||||
Warning = 4,
|
||||
Error = 8
|
||||
}
|
||||
}
|
||||
34
MediaBrowser.Common/Logging/Logger.cs
Normal file
34
MediaBrowser.Common/Logging/Logger.cs
Normal file
@@ -0,0 +1,34 @@
|
||||
using System;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
public static class Logger
|
||||
{
|
||||
public static BaseLogger LoggerInstance { get; set; }
|
||||
|
||||
public static void LogInfo(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogInfo(message, paramList);
|
||||
}
|
||||
|
||||
public static void LogDebugInfo(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogDebugInfo(message, paramList);
|
||||
}
|
||||
|
||||
public static void LogError(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogError(message, paramList);
|
||||
}
|
||||
|
||||
public static void LogException(string message, Exception ex, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogException(message, ex, paramList);
|
||||
}
|
||||
|
||||
public static void LogWarning(string message, params object[] paramList)
|
||||
{
|
||||
LoggerInstance.LogWarning(message, paramList);
|
||||
}
|
||||
}
|
||||
}
|
||||
33
MediaBrowser.Common/Logging/StreamLogger.cs
Normal file
33
MediaBrowser.Common/Logging/StreamLogger.cs
Normal file
@@ -0,0 +1,33 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace MediaBrowser.Common.Logging
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides a Logger that can write to any Stream
|
||||
/// </summary>
|
||||
public class StreamLogger : BaseLogger
|
||||
{
|
||||
private Stream Stream { get; set; }
|
||||
|
||||
public StreamLogger(Stream stream)
|
||||
: base()
|
||||
{
|
||||
Stream = stream;
|
||||
}
|
||||
|
||||
protected override void LogEntry(LogRow row)
|
||||
{
|
||||
byte[] bytes = new UTF8Encoding().GetBytes(row.ToString() + Environment.NewLine);
|
||||
Stream.Write(bytes, 0, bytes.Length);
|
||||
Stream.Flush();
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
{
|
||||
base.Dispose();
|
||||
Stream.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user