From a3f08b02cada12be9188a21b61c7bac8ef6c62f0 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Wed, 22 Aug 2012 16:07:16 -0400 Subject: [PATCH] Tweaked log output formatting --- MediaBrowser.Common/Logging/BaseLogger.cs | 3 +- MediaBrowser.Common/Logging/LogRow.cs | 34 +++++++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/MediaBrowser.Common/Logging/BaseLogger.cs b/MediaBrowser.Common/Logging/BaseLogger.cs index c7c63d55e0..fbd2877503 100644 --- a/MediaBrowser.Common/Logging/BaseLogger.cs +++ b/MediaBrowser.Common/Logging/BaseLogger.cs @@ -71,9 +71,8 @@ namespace MediaBrowser.Common.Logging { Severity = severity, Message = message, - Category = string.Empty, ThreadId = currentThread.ManagedThreadId, - //ThreadName = currentThread.Name, + ThreadName = currentThread.Name, Time = DateTime.Now }; diff --git a/MediaBrowser.Common/Logging/LogRow.cs b/MediaBrowser.Common/Logging/LogRow.cs index fda7142632..052f6062aa 100644 --- a/MediaBrowser.Common/Logging/LogRow.cs +++ b/MediaBrowser.Common/Logging/LogRow.cs @@ -1,5 +1,7 @@ using System; using System.Text; +using System.Collections.Generic; +using System.Linq; namespace MediaBrowser.Common.Logging { @@ -9,27 +11,31 @@ namespace MediaBrowser.Common.Logging 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)); + List data = new List(); - return builder.ToString(); + data.Add(Time.ToString(TimePattern)); + + data.Add(Severity.ToString()); + + if (!string.IsNullOrEmpty(Message)) + { + data.Add(Encode(Message)); + } + + data.Add(ThreadId.ToString()); + + if (!string.IsNullOrEmpty(ThreadName)) + { + data.Add(Encode(ThreadName)); + } + + return string.Join(" , ", data.ToArray()); } private string Encode(string str)