瀏覽代碼

Tweaked log output formatting

LukePulverenti Luke Pulverenti luke pulverenti 13 年之前
父節點
當前提交
a3f08b02ca
共有 2 個文件被更改,包括 22 次插入17 次删除
  1. 1 2
      MediaBrowser.Common/Logging/BaseLogger.cs
  2. 21 15
      MediaBrowser.Common/Logging/LogRow.cs

+ 1 - 2
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
             };
 

+ 21 - 15
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));
-
-            return builder.ToString();
+            List<string> data = new List<string>();
+
+            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)