From d4c75e39748679e7c039cb1eae4ad7232e2fe2b6 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 30 Jul 2012 23:38:00 -0400 Subject: Fixed some project fragmentation that came from efforts to go portable --- .../Configuration/BaseApplicationConfiguration.cs | 19 ++++++ MediaBrowser.Common/Json/JsonSerializer.cs | 14 +--- MediaBrowser.Common/Kernel/BaseKernel.cs | 16 +++-- MediaBrowser.Common/Logging/BaseLogger.cs | 76 ++++++++++++++++++++++ MediaBrowser.Common/Logging/LogRow.cs | 40 ++++++++++++ MediaBrowser.Common/Logging/LogSeverity.cs | 14 ++++ MediaBrowser.Common/Logging/Logger.cs | 34 ++++++++++ MediaBrowser.Common/Logging/StreamLogger.cs | 33 ++++++++++ MediaBrowser.Common/MediaBrowser.Common.csproj | 10 +-- MediaBrowser.Common/Plugins/BasePlugin.cs | 30 ++++----- 10 files changed, 247 insertions(+), 39 deletions(-) create mode 100644 MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs create mode 100644 MediaBrowser.Common/Logging/BaseLogger.cs create mode 100644 MediaBrowser.Common/Logging/LogRow.cs create mode 100644 MediaBrowser.Common/Logging/LogSeverity.cs create mode 100644 MediaBrowser.Common/Logging/Logger.cs create mode 100644 MediaBrowser.Common/Logging/StreamLogger.cs (limited to 'MediaBrowser.Common') diff --git a/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs new file mode 100644 index 0000000000..7ed782bdb1 --- /dev/null +++ b/MediaBrowser.Common/Configuration/BaseApplicationConfiguration.cs @@ -0,0 +1,19 @@ +using MediaBrowser.Common.Logging; + +namespace MediaBrowser.Common.Configuration +{ + /// + /// Serves as a common base class for the Server and UI application Configurations + /// + public class BaseApplicationConfiguration + { + public LogSeverity LogSeverity { get; set; } + public int HttpServerPortNumber { get; set; } + + public BaseApplicationConfiguration() + { + LogSeverity = LogSeverity.Info; + HttpServerPortNumber = 8096; + } + } +} diff --git a/MediaBrowser.Common/Json/JsonSerializer.cs b/MediaBrowser.Common/Json/JsonSerializer.cs index b7db1d9006..8e132c1528 100644 --- a/MediaBrowser.Common/Json/JsonSerializer.cs +++ b/MediaBrowser.Common/Json/JsonSerializer.cs @@ -7,15 +7,11 @@ namespace MediaBrowser.Common.Json { public static void SerializeToStream(T obj, Stream stream) { - Configure(); - ServiceStack.Text.JsonSerializer.SerializeToStream(obj, stream); } public static void SerializeToFile(T obj, string file) { - Configure(); - using (StreamWriter streamWriter = new StreamWriter(file)) { ServiceStack.Text.JsonSerializer.SerializeToWriter(obj, streamWriter); @@ -24,8 +20,6 @@ namespace MediaBrowser.Common.Json public static object DeserializeFromFile(Type type, string file) { - Configure(); - using (Stream stream = File.OpenRead(file)) { return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream); @@ -34,8 +28,6 @@ namespace MediaBrowser.Common.Json public static T DeserializeFromFile(string file) { - Configure(); - using (Stream stream = File.OpenRead(file)) { return ServiceStack.Text.JsonSerializer.DeserializeFromStream(stream); @@ -44,19 +36,15 @@ namespace MediaBrowser.Common.Json public static T DeserializeFromStream(Stream stream) { - Configure(); - return ServiceStack.Text.JsonSerializer.DeserializeFromStream(stream); } public static T DeserializeFromString(string data) { - Configure(); - return ServiceStack.Text.JsonSerializer.DeserializeFromString(data); } - private static void Configure() + public static void Configure() { ServiceStack.Text.JsConfig.ExcludeTypeInfo = true; ServiceStack.Text.JsConfig.IncludeNullValues = false; diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 820d94831a..0fdc1f8131 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -6,12 +6,12 @@ using System.Configuration; using System.IO; using System.Linq; using System.Reflection; -using MediaBrowser.Common.Json; +using MediaBrowser.Common.Configuration; +using MediaBrowser.Common.Logging; using MediaBrowser.Common.Net; using MediaBrowser.Common.Plugins; -using MediaBrowser.Logging; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Progress; +using MediaBrowser.Common.Json; namespace MediaBrowser.Common.Kernel { @@ -93,19 +93,21 @@ namespace MediaBrowser.Common.Kernel public virtual void Init(IProgress progress) { + JsonSerializer.Configure(); + ReloadLogger(); ReloadConfiguration(); ReloadHttpServer(); - + ReloadComposableParts(); } private void ReloadLogger() { DisposeLogger(); - + if (!Directory.Exists(LogDirectoryPath)) { Directory.CreateDirectory(LogDirectoryPath); @@ -115,8 +117,8 @@ namespace MediaBrowser.Common.Kernel LogFilePath = Path.Combine(LogDirectoryPath, now.ToString("dMyyyy") + "-" + now.Ticks + ".log"); - FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read); - + FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read); + Logger.LoggerInstance = new StreamLogger(fs); } diff --git a/MediaBrowser.Common/Logging/BaseLogger.cs b/MediaBrowser.Common/Logging/BaseLogger.cs new file mode 100644 index 0000000000..04c3b80977 --- /dev/null +++ b/MediaBrowser.Common/Logging/BaseLogger.cs @@ -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); + } +} diff --git a/MediaBrowser.Common/Logging/LogRow.cs b/MediaBrowser.Common/Logging/LogRow.cs new file mode 100644 index 0000000000..fda7142632 --- /dev/null +++ b/MediaBrowser.Common/Logging/LogRow.cs @@ -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] "); + } + } +} diff --git a/MediaBrowser.Common/Logging/LogSeverity.cs b/MediaBrowser.Common/Logging/LogSeverity.cs new file mode 100644 index 0000000000..2abab1a448 --- /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 + } +} diff --git a/MediaBrowser.Common/Logging/Logger.cs b/MediaBrowser.Common/Logging/Logger.cs new file mode 100644 index 0000000000..d1ae9b8f35 --- /dev/null +++ b/MediaBrowser.Common/Logging/Logger.cs @@ -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); + } + } +} diff --git a/MediaBrowser.Common/Logging/StreamLogger.cs b/MediaBrowser.Common/Logging/StreamLogger.cs new file mode 100644 index 0000000000..058c7e69c5 --- /dev/null +++ b/MediaBrowser.Common/Logging/StreamLogger.cs @@ -0,0 +1,33 @@ +using System; +using System.IO; +using System.Text; + +namespace MediaBrowser.Common.Logging +{ + /// + /// Provides a Logger that can write to any Stream + /// + 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(); + } + } +} diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index bf9d17b78c..8c8146cdcb 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -48,10 +48,16 @@ + + + + + + @@ -67,10 +73,6 @@ - - {37032b77-fe2e-4ec5-b7e4-baf634443578} - MediaBrowser.Logging - {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b} MediaBrowser.Model diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs index 61ecffc758..98b6120f7e 100644 --- a/MediaBrowser.Common/Plugins/BasePlugin.cs +++ b/MediaBrowser.Common/Plugins/BasePlugin.cs @@ -1,8 +1,8 @@ using System; using System.IO; -using MediaBrowser.Common.Json; -using MediaBrowser.Model.Plugins; using MediaBrowser.Common.Kernel; +using MediaBrowser.Model.Plugins; +using MediaBrowser.Common.Json; namespace MediaBrowser.Common.Plugins { @@ -100,19 +100,6 @@ namespace MediaBrowser.Common.Plugins } } - public void ReloadConfiguration() - { - if (!File.Exists(ConfigurationPath)) - { - Configuration = Activator.CreateInstance(ConfigurationType) as BasePluginConfiguration; - } - else - { - Configuration = JsonSerializer.DeserializeFromFile(ConfigurationType, ConfigurationPath) as BasePluginConfiguration; - Configuration.DateLastModified = File.GetLastWriteTime(ConfigurationPath); - } - } - /// /// Starts the plugin. /// @@ -126,5 +113,18 @@ namespace MediaBrowser.Common.Plugins public virtual void Dispose() { } + + public void ReloadConfiguration() + { + if (!File.Exists(ConfigurationPath)) + { + Configuration = Activator.CreateInstance(ConfigurationType) as BasePluginConfiguration; + } + else + { + Configuration = JsonSerializer.DeserializeFromFile(ConfigurationType, ConfigurationPath) as BasePluginConfiguration; + Configuration.DateLastModified = File.GetLastWriteTime(ConfigurationPath); + } + } } } -- cgit v1.2.3