alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-23 03:28:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

display server name in dashboard

Browse Source
This commit is contained in:
Luke Pulverenti
2015-01-18 14:53:34 -05:00
parent 5f76b59e67
commit cefd565e67
11 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@@ -41,8 +41,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private readonly ReaderWriterLockSlim _localEndpointLock = new ReaderWriterLockSlim();
private readonly bool _supportsNativeWebSocket;
private string _certificatePath;
/// <summary>
@@ -67,12 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ILogManager logManager,
string serviceName,
string defaultRedirectPath,
bool supportsNativeWebSocket,
params Assembly[] assembliesWithServices)
: base(serviceName, assembliesWithServices)
{
DefaultRedirectPath = defaultRedirectPath;
_supportsNativeWebSocket = supportsNativeWebSocket;
_logger = logManager.GetLogger("HttpServer");
@@ -210,13 +206,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private IHttpListener GetListener()
{
if (_supportsNativeWebSocket && NativeWebSocket.IsSupported)
{
// Certificate location is ignored here. You need to use netsh
// to assign the certificate to the proper port.
return new HttpListenerServer(_logger, OnRequestReceived);
}
return new WebSocketSharpListener(_logger, OnRequestReceived, _certificatePath);
}

6
MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
View File

@@ -17,17 +17,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// <param name="logManager">The log manager.</param>
/// <param name="serverName">Name of the server.</param>
/// <param name="defaultRedirectpath">The default redirectpath.</param>
/// <param name="supportsNativeWebSocket">if set to <c>true</c> [supports native web socket].</param>
/// <returns>IHttpServer.</returns>
public static IHttpServer CreateServer(IApplicationHost applicationHost,
ILogManager logManager,
string serverName,
string defaultRedirectpath,
bool supportsNativeWebSocket)
string defaultRedirectpath)
{
LogManager.LogFactory = new ServerLogFactory(logManager);
return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath, supportsNativeWebSocket);
return new HttpListenerHost(applicationHost, logManager, serverName, defaultRedirectpath);
}
}
}