diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 80ac37d527..c44cfd4730 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -378,14 +378,13 @@ namespace MediaBrowser.Common.Implementations
/// Task.
public virtual Task RunStartupTasks()
{
- return Task.Run(() =>
- {
- Resolve().AddTasks(GetExports(false));
+ Resolve().AddTasks(GetExports(false));
- Task.Run(() => ConfigureAutorun());
+ ConfigureAutorun ();
- ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
- });
+ ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
+
+ return Task.FromResult (true);
}
///
diff --git a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
index b8ee60f018..b18c6b95a6 100644
--- a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
+++ b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs
@@ -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
/// The level.
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);
}
///
@@ -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");
}
}
}
diff --git a/MediaBrowser.Server.Mac/AppController.cs b/MediaBrowser.Server.Mac/AppController.cs
index 2da1de5b52..445a54b3d1 100644
--- a/MediaBrowser.Server.Mac/AppController.cs
+++ b/MediaBrowser.Server.Mac/AppController.cs
@@ -26,7 +26,6 @@ namespace MediaBrowser.Server.Mac
{
Instance = this;
MainClass.AddDependencies (this);
- ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
}
public override void AwakeFromNib()
@@ -74,7 +73,9 @@ namespace MediaBrowser.Server.Mac
});
statusMenu.AddItem (quitMenuItem);
- LocalizeText ();
+ //ConfigurationManager.ConfigurationUpdated -= Instance_ConfigurationUpdated;
+ //LocalizeText ();
+ //ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
}
public IServerApplicationHost AppHost{ get; set;}
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 83665540f2..5618d02d5a 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -55,7 +55,6 @@ namespace MediaBrowser.Server.Mac
StartApplication(appPaths, logManager, options);
NSApplication.Init ();
NSApplication.Main (args);
- var b = true;
}
public static void AddDependencies(AppController appController){
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
index b78cfeb8be..73e2e601a1 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
@@ -108,7 +108,6 @@
PreserveNewest
-
diff --git a/MediaBrowser.Server.Mac/app.config b/MediaBrowser.Server.Mac/app.config
deleted file mode 100644
index 863b328fb2..0000000000
--- a/MediaBrowser.Server.Mac/app.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-