alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-27 19:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update mac project

Browse Source
This commit is contained in:
Luke
2014-11-26 22:10:44 -05:00
parent 89c0085e28
commit 7016173217
6 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
View File

@@ -378,14 +378,13 @@ namespace MediaBrowser.Common.Implementations
/// <returns>Task.</returns>
public virtual Task RunStartupTasks()
{
return Task.Run(() =>
{
Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
Resolve<ITaskManager>().AddTasks(GetExports<IScheduledTask>(false));
Task.Run(() => ConfigureAutorun());
ConfigureAutorun ();
ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
});
ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
return Task.FromResult (true);
}
/// <summary>

28
MediaBrowser.Common.Implementations/Logging/NlogManager.cs
View File

@@ -2,6 +2,7 @@
using NLog;
using NLog.Config;
using NLog.Targets;
using NLog.Targets.Wrappers;
using System;
using System.IO;
using System.Linq;
@@ -42,6 +43,8 @@ namespace MediaBrowser.Common.Implementations.Logging
{
LogDirectory = logDirectory;
LogFilePrefix = logFileNamePrefix;
LogManager.Configuration = new LoggingConfiguration ();
}
private LogSeverity _severity = LogSeverity.Debug;
@@ -86,16 +89,22 @@ namespace MediaBrowser.Common.Implementations.Logging
/// <param name="level">The level.</param>
private void AddFileTarget(string path, LogSeverity level)
{
var logFile = new FileTarget
RemoveTarget("ApplicationLogFileWrapper");
var wrapper = new AsyncTargetWrapper ();
wrapper.Name = "ApplicationLogFileWrapper";
var logFile = new FileTarget
{
FileName = path,
Layout = "${longdate} ${level} - ${logger}: ${message}"
};
RemoveTarget("ApplicationLogFile");
logFile.Name = "ApplicationLogFile";
AddLogTarget(logFile, level);
wrapper.WrappedTarget = logFile;
AddLogTarget(wrapper, level);
}
/// <summary>
@@ -216,22 +225,27 @@ namespace MediaBrowser.Common.Implementations.Logging
public void AddConsoleOutput()
{
RemoveTarget("ConsoleTargetWrapper");
var wrapper = new AsyncTargetWrapper ();
wrapper.Name = "ConsoleTargetWrapper";
var target = new ConsoleTarget()
{
Layout = "${level}, ${logger}, ${message}",
Error = false
};
RemoveTarget("ConsoleTarget");
target.Name = "ConsoleTarget";
AddLogTarget(target, LogSeverity);
wrapper.WrappedTarget = target;
AddLogTarget(wrapper, LogSeverity);
}
public void RemoveConsoleOutput()
{
RemoveTarget("ConsoleTarget");
RemoveTarget("ConsoleTargetWrapper");
}
}
}