aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/ApplicationHost.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-09-05 15:49:26 -0400
committerGitHub <noreply@github.com>2017-09-05 15:49:26 -0400
commit5116b175ce4a1f3a54c64c6f8fa8e8fba1a69e1a (patch)
treece6784069ed4cb412c917dc1e3d884c56dea2654 /Emby.Server.Implementations/ApplicationHost.cs
parent637795aaf5e203d3a5a98cf9caa742663d0ee14e (diff)
parent49b799adbe3d65973b136bee758584748ecf6c2a (diff)
Merge pull request #2866 from MediaBrowser/dev
3.2.30.8
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index b264cffe6..b3268b156 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -828,7 +828,7 @@ namespace Emby.Server.Implementations
RegisterSingleInstance(MemoryStreamFactory);
RegisterSingleInstance(SystemEvents);
- RegisterSingleInstance(LogManager);
+ RegisterSingleInstance(LogManager, false);
RegisterSingleInstance(Logger);
RegisterSingleInstance(EnvironmentInfo);
@@ -2341,6 +2341,7 @@ namespace Emby.Server.Implementations
_disposed = true;
Dispose(true);
+ GC.SuppressFinalize(this);
}
}
@@ -2354,6 +2355,7 @@ namespace Emby.Server.Implementations
{
var type = GetType();
+ LogManager.AddConsoleOutput();
Logger.Info("Disposing " + type.Name);
var parts = DisposableParts.Distinct().Where(i => i.GetType() != type).ToList();