starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-20 15:55:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

added a shutdown api method, font size fix and other decouplings

Browse Source
This commit is contained in:
LukePulverenti
2013-02-26 11:10:55 -05:00
parent efdb2f3990
commit 6efd22a3d2
30 changed files with 420 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
MediaBrowser.Common/Kernel/BaseKernel.cs
View File

@@ -1,5 +1,4 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Logging;
@@ -165,7 +164,7 @@ namespace MediaBrowser.Common.Kernel
/// Gets or sets the TCP manager.
/// </summary>
/// <value>The TCP manager.</value>
public TcpManager TcpManager { get; private set; }
public IServerManager ServerManager { get; private set; }
/// <summary>
/// Gets the UDP server port number.
@@ -202,15 +201,6 @@ namespace MediaBrowser.Common.Kernel
/// <value>The kernel context.</value>
public abstract KernelContext KernelContext { get; }
/// <summary>
/// Gets the log file path.
/// </summary>
/// <value>The log file path.</value>
public string LogFilePath
{
get { return ApplicationHost.LogFilePath; }
}
/// <summary>
/// Gets the logger.
/// </summary>
@@ -238,23 +228,6 @@ namespace MediaBrowser.Common.Kernel
/// <exception cref="System.ArgumentNullException">isoManager</exception>
protected BaseKernel(IApplicationHost appHost, TApplicationPathsType appPaths, IXmlSerializer xmlSerializer, ILogger logger)
{
if (appHost == null)
{
throw new ArgumentNullException("appHost");
}
if (appPaths == null)
{
throw new ArgumentNullException("appPaths");
}
if (xmlSerializer == null)
{
throw new ArgumentNullException("xmlSerializer");
}
if (logger == null)
{
throw new ArgumentNullException("logger");
}
ApplicationPaths = appPaths;
ApplicationHost = appHost;
_xmlSerializer = xmlSerializer;
@@ -291,8 +264,8 @@ namespace MediaBrowser.Common.Kernel
await OnComposablePartsLoaded().ConfigureAwait(false);
DisposeTcpManager();
TcpManager = (TcpManager)ApplicationHost.CreateInstance(typeof(TcpManager));
ServerManager = ApplicationHost.Resolve<IServerManager>();
ServerManager.Start();
}
/// <summary>
@@ -357,7 +330,7 @@ namespace MediaBrowser.Common.Kernel
{
HasPendingRestart = true;
TcpManager.SendWebSocketMessage("HasPendingRestartChanged", GetSystemInfo());
ServerManager.SendWebSocketMessage("HasPendingRestartChanged", GetSystemInfo());
EventHelper.QueueEventIfNotNull(HasPendingRestartChanged, this, EventArgs.Empty, Logger);
}
@@ -377,22 +350,7 @@ namespace MediaBrowser.Common.Kernel
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
protected virtual void Dispose(bool dispose)
{
if (dispose)
{
DisposeTcpManager();
}
}
/// <summary>
/// Disposes the TCP manager.
/// </summary>
private void DisposeTcpManager()
{
if (TcpManager != null)
{
TcpManager.Dispose();
TcpManager = null;
}
}
/// <summary>
@@ -424,8 +382,8 @@ namespace MediaBrowser.Common.Kernel
HasPendingRestart = HasPendingRestart,
Version = ApplicationHost.ApplicationVersion.ToString(),
IsNetworkDeployed = ApplicationHost.CanSelfUpdate,
WebSocketPortNumber = TcpManager.WebSocketPortNumber,
SupportsNativeWebSocket = TcpManager.SupportsNativeWebSocket,
WebSocketPortNumber = ServerManager.WebSocketPortNumber,
SupportsNativeWebSocket = ServerManager.SupportsNativeWebSocket,
FailedPluginAssemblies = ApplicationHost.FailedAssemblies.ToArray()
};
}