5 files changed, 205 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Logging/BaseLogger.cs b/MediaBrowser.Common/Logging/BaseLogger.cs
new file mode 100644
index 000000000..a97bc201f
--- /dev/null
+++ b/MediaBrowser.Common/Logging/BaseLogger.cs
@@ -0,0 +1,16 @@
+using MediaBrowser.Common.Kernel;
+using System;
+
+namespace MediaBrowser.Common.Logging
+{
+    public abstract class BaseLogger : IDisposable
+    {
+        public abstract void Initialize(IKernel kernel);
+        public abstract void LogEntry(LogRow row);
+
+        public virtual void Dispose()
+        {
+            Logger.LogInfo("Disposing " + GetType().Name);
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Logging/LogRow.cs b/MediaBrowser.Common/Logging/LogRow.cs
new file mode 100644
index 000000000..6fecef59c
--- /dev/null
+++ b/MediaBrowser.Common/Logging/LogRow.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+
+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 int ThreadId { get; set; }
+        public string ThreadName { get; set; }
+        public DateTime Time { get; set; }
+
+        public override string ToString()
+        {
+            var 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)
+        {
+            return (str ?? "").Replace(",", ",,").Replace(Environment.NewLine, " [n] ");
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Logging/LogSeverity.cs b/MediaBrowser.Common/Logging/LogSeverity.cs
new file mode 100644
index 000000000..97abfe7b5
--- /dev/null
+++ b/MediaBrowser.Common/Logging/LogSeverity.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace MediaBrowser.Common.Logging
+{
+    [Flags]
+    public enum LogSeverity
+    {
+        None = 0,
+        Debug = 1,
+        Info = 2,
+        Warning = 4,
+        Error = 8
+    }
+}
+\ No newline at end of file
diff --git a/MediaBrowser.Common/Logging/Logger.cs b/MediaBrowser.Common/Logging/Logger.cs
new file mode 100644
index 000000000..9ac02fe3e
--- /dev/null
+++ b/MediaBrowser.Common/Logging/Logger.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using MediaBrowser.Common.Kernel;
+
+namespace MediaBrowser.Common.Logging
+{
+    public static class Logger
+    {
+        internal static IKernel Kernel { get; set; }
+
+        public static void LogInfo(string message, params object[] paramList)
+        {
+            LogEntry(message, LogSeverity.Info, paramList);
+        }
+
+        public static void LogDebugInfo(string message, params object[] paramList)
+        {
+            LogEntry(message, LogSeverity.Debug, paramList);
+        }
+
+        public static void LogError(string message, params object[] paramList)
+        {
+            LogEntry(message, LogSeverity.Error, paramList);
+        }
+
+        public static void LogException(Exception ex, params object[] paramList)
+        {
+            LogException(string.Empty, ex, paramList);
+        }
+
+        public static void LogException(string message, Exception ex, params object[] 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)
+        {
+            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;
+        }
+    }
+}
diff --git a/MediaBrowser.Common/Logging/TraceFileLogger.cs b/MediaBrowser.Common/Logging/TraceFileLogger.cs
new file mode 100644
index 000000000..7ab67a137
--- /dev/null
+++ b/MediaBrowser.Common/Logging/TraceFileLogger.cs
@@ -0,0 +1,38 @@
+using MediaBrowser.Common.Kernel;
+using System;
+using System.ComponentModel.Composition;
+using System.Diagnostics;
+using System.IO;
+
+namespace MediaBrowser.Common.Logging
+{
+    [Export(typeof(BaseLogger))]
+    public class TraceFileLogger : BaseLogger
+    {
+        private TraceListener Listener { get; set; }
+
+        public override void Initialize(IKernel kernel)
+        {
+            DateTime now = DateTime.Now;
+
+            string logFilePath = Path.Combine(kernel.ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
+
+            Listener = new TextWriterTraceListener(logFilePath);
+            Trace.Listeners.Add(Listener);
+            Trace.AutoFlush = true;
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            Trace.Listeners.Remove(Listener);
+            Listener.Dispose();
+        }
+
+        public override void LogEntry(LogRow row)
+        {
+            Trace.WriteLine(row.ToString());
+        }
+    }
+}