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

a little more kernel consolidation

Browse Source
This commit is contained in:
Luke Pulverenti
2013-06-03 14:15:35 -04:00
parent 59118a2ddb
commit 08d9004d8f
12 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
View File

@@ -59,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
/// <summary>
/// The _application host
/// </summary>
private readonly IApplicationHost _applicationHost;
private readonly IServerApplicationHost _applicationHost;
/// <summary>
/// Gets or sets the configuration manager.
@@ -91,11 +91,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager
/// <value>The web socket listeners.</value>
private readonly List<IWebSocketListener> _webSocketListeners = new List<IWebSocketListener>();
/// <summary>
/// The _kernel
/// </summary>
private readonly Kernel _kernel;
/// <summary>
/// Initializes a new instance of the <see cref="ServerManager" /> class.
/// </summary>
@@ -103,9 +98,8 @@ namespace MediaBrowser.Server.Implementations.ServerManager
/// <param name="jsonSerializer">The json serializer.</param>
/// <param name="logger">The logger.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <param name="kernel">The kernel.</param>
/// <exception cref="System.ArgumentNullException">applicationHost</exception>
public ServerManager(IApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, Kernel kernel)
public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager)
{
if (applicationHost == null)
{
@@ -124,7 +118,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager
_jsonSerializer = jsonSerializer;
_applicationHost = applicationHost;
ConfigurationManager = configurationManager;
_kernel = kernel;
ConfigurationManager.ConfigurationUpdated += ConfigurationUpdated;
}
@@ -161,7 +154,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
private void ReloadHttpServer()
{
// Only reload if the port has changed, so that we don't disconnect any active users
if (HttpServer != null && HttpServer.UrlPrefix.Equals(_kernel.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
if (HttpServer != null && HttpServer.UrlPrefix.Equals(_applicationHost.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
{
return;
}
@@ -174,7 +167,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
{
HttpServer = _applicationHost.Resolve<IHttpServer>();
HttpServer.EnableHttpRequestLogging = ConfigurationManager.Configuration.EnableHttpLevelLogging;
HttpServer.Start(_kernel.HttpServerUrlPrefix);
HttpServer.Start(_applicationHost.HttpServerUrlPrefix);
}
catch (HttpListenerException ex)
{

6
MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
View File

@@ -49,7 +49,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
/// <param name="dbPath">The db path.</param>
/// <returns>Task{System.Boolean}.</returns>
/// <exception cref="System.ArgumentNullException">dbPath</exception>
protected async Task ConnectToDb(string dbPath)
protected Task ConnectToDb(string dbPath)
{
if (string.IsNullOrEmpty(dbPath))
{
@@ -68,7 +68,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
Connection = new SQLiteConnection(connectionstr.ConnectionString);
await Connection.OpenAsync().ConfigureAwait(false);
return Connection.OpenAsync();
}
/// <summary>
@@ -164,7 +164,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
{
throw new ArgumentNullException("reader");
}
var memoryStream = new MemoryStream();
var num = 0L;
var array = new byte[4096];