diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-10 21:34:02 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-10 21:34:02 -0400 |
| commit | 2467ca966823d78737a268d2c3b3730bc3b286cc (patch) | |
| tree | b9f2d9a1c84d56ea11ddf66e5bf508a151102c9d /MediaBrowser.Common | |
| parent | b1df61f7cededfdea119e98296f74e1313e4ffe3 (diff) | |
Moved some entities to the main project
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Common/Logging/ThreadedLogger.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/Logging/TraceLogger.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 1 |
4 files changed, 20 insertions, 10 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index b409ba5827..3c8fff2128 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -85,22 +86,18 @@ namespace MediaBrowser.Common.Kernel await ReloadComposableParts().ConfigureAwait(false);
}
- /// <summary>
- /// Gets or sets the path to the current log file
- /// </summary>
- public static string LogFilePath { get; set; }
-
private void ReloadLogger()
{
DisposeLogger();
DateTime now = DateTime.Now;
- LogFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
+ string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
- FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read);
+ Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
+ Trace.AutoFlush = true;
- Logger.LoggerInstance = new StreamLogger(fs);
+ Logger.LoggerInstance = new TraceLogger();
}
/// <summary>
@@ -264,6 +261,8 @@ namespace MediaBrowser.Common.Kernel /// </summary>
private void DisposeLogger()
{
+ Trace.Listeners.Clear();
+
if (Logger.LoggerInstance != null)
{
Logger.LoggerInstance.Dispose();
diff --git a/MediaBrowser.Common/Logging/ThreadedLogger.cs b/MediaBrowser.Common/Logging/ThreadedLogger.cs index 8713ac2248..f53b3d4260 100644 --- a/MediaBrowser.Common/Logging/ThreadedLogger.cs +++ b/MediaBrowser.Common/Logging/ThreadedLogger.cs @@ -1,7 +1,5 @@ using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading;
namespace MediaBrowser.Common.Logging
diff --git a/MediaBrowser.Common/Logging/TraceLogger.cs b/MediaBrowser.Common/Logging/TraceLogger.cs new file mode 100644 index 0000000000..d152f97806 --- /dev/null +++ b/MediaBrowser.Common/Logging/TraceLogger.cs @@ -0,0 +1,12 @@ +using System.Diagnostics;
+
+namespace MediaBrowser.Common.Logging
+{
+ public class TraceLogger : BaseLogger
+ {
+ protected override void LogEntry(LogRow row)
+ {
+ Trace.WriteLine(row.ToString());
+ }
+ }
+}
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 1ea8ba4a47..9b801d9498 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -84,6 +84,7 @@ <Compile Include="Kernel\BaseApplicationPaths.cs" />
<Compile Include="Drawing\DrawingUtils.cs" />
<Compile Include="Logging\ThreadedLogger.cs" />
+ <Compile Include="Logging\TraceLogger.cs" />
<Compile Include="Net\Handlers\StaticFileHandler.cs" />
<Compile Include="Net\MimeTypes.cs" />
<Compile Include="Properties\Resources.Designer.cs">
|