Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused _listener

Browse Source
This commit is contained in:
Claus Vium 2019-03-05 08:05:42 +01:00
parent 12df381495
commit 51648a2a21
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -33,12 +33,8 @@ namespace Emby.Server.Implementations.HttpServer
public class HttpListenerHost : IHttpServer, IDisposable public class HttpListenerHost : IHttpServer, IDisposable
{ {
private string DefaultRedirectPath { get; set; } private string DefaultRedirectPath { get; set; }
private readonly ILogger _logger;
public string[] UrlPrefixes { get; private set; } public string[] UrlPrefixes { get; private set; }
private IHttpListener _listener;
public event EventHandler<GenericEventArgs<IWebSocketConnection>> WebSocketConnected; public event EventHandler<GenericEventArgs<IWebSocketConnection>> WebSocketConnected;
private readonly IServerConfigurationManager _config; private readonly IServerConfigurationManager _config;
@ -68,7 +64,7 @@ namespace Emby.Server.Implementations.HttpServer
IHttpListener socketListener) IHttpListener socketListener)
{ {
_appHost = applicationHost; _appHost = applicationHost;
_logger = loggerFactory.CreateLogger("HttpServer"); Logger = loggerFactory.CreateLogger("HttpServer");
_config = config; _config = config;
DefaultRedirectPath = configuration["HttpListenerHost:DefaultRedirectPath"]; DefaultRedirectPath = configuration["HttpListenerHost:DefaultRedirectPath"];
_networkManager = networkManager; _networkManager = networkManager;
@ -85,7 +81,7 @@ namespace Emby.Server.Implementations.HttpServer
public string GlobalResponse { get; set; } public string GlobalResponse { get; set; }
protected ILogger Logger => _logger; protected ILogger Logger { get; }
public object CreateInstance(Type type) public object CreateInstance(Type type)
{ {
@ -151,7 +147,7 @@ namespace Emby.Server.Implementations.HttpServer
return; return;
} }
var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, _jsonSerializer, _logger) var connection = new WebSocketConnection(e.WebSocket, e.Endpoint, _jsonSerializer, Logger)
{ {
OnReceive = ProcessWebSocketMessageReceived, OnReceive = ProcessWebSocketMessageReceived,
Url = e.Url, Url = e.Url,
@ -220,11 +216,11 @@ namespace Emby.Server.Implementations.HttpServer
if (logExceptionStackTrace) if (logExceptionStackTrace)
{ {
_logger.LogError(ex, "Error processing request"); Logger.LogError(ex, "Error processing request");
} }
else if (logExceptionMessage) else if (logExceptionMessage)
{ {
_logger.LogError(ex.Message); Logger.LogError(ex.Message);
} }
var httpRes = httpReq.Response; var httpRes = httpReq.Response;
@ -242,7 +238,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
catch (Exception errorEx) catch (Exception errorEx)
{ {
_logger.LogError(errorEx, "Error this.ProcessRequest(context)(Exception while writing error to the response)"); Logger.LogError(errorEx, "Error this.ProcessRequest(context)(Exception while writing error to the response)");
} }
} }
@ -285,14 +281,6 @@ namespace Emby.Server.Implementations.HttpServer
} }
} }
if (_listener != null)
{
_logger.LogInformation("Stopping HttpListener...");
var task = _listener.Stop();
Task.WaitAll(task);
_logger.LogInformation("HttpListener stopped");
}
} }
public static string RemoveQueryStringByKey(string url, string key) public static string RemoveQueryStringByKey(string url, string key)
@ -613,11 +601,11 @@ namespace Emby.Server.Implementations.HttpServer
var elapsed = stopWatch.Elapsed; var elapsed = stopWatch.Elapsed;
if (elapsed.TotalMilliseconds > 500) if (elapsed.TotalMilliseconds > 500)
{ {
_logger.LogWarning("HTTP Response {StatusCode} to {RemoteIp}. Time (slow): {Elapsed:g}. {Url}", httpRes.StatusCode, remoteIp, elapsed, urlToLog); Logger.LogWarning("HTTP Response {StatusCode} to {RemoteIp}. Time (slow): {Elapsed:g}. {Url}", httpRes.StatusCode, remoteIp, elapsed, urlToLog);
} }
else else
{ {
_logger.LogDebug("HTTP Response {StatusCode} to {RemoteIp}. Time: {Elapsed:g}. {Url}", httpRes.StatusCode, remoteIp, elapsed, urlToLog); Logger.LogDebug("HTTP Response {StatusCode} to {RemoteIp}. Time: {Elapsed:g}. {Url}", httpRes.StatusCode, remoteIp, elapsed, urlToLog);
} }
} }
} }
@ -630,7 +618,7 @@ namespace Emby.Server.Implementations.HttpServer
var pathParts = pathInfo.TrimStart('/').Split('/'); var pathParts = pathInfo.TrimStart('/').Split('/');
if (pathParts.Length == 0) if (pathParts.Length == 0)
{ {
_logger.LogError("Path parts empty for PathInfo: {PathInfo}, Url: {RawUrl}", pathInfo, httpReq.RawUrl); Logger.LogError("Path parts empty for PathInfo: {PathInfo}, Url: {RawUrl}", pathInfo, httpReq.RawUrl);
return null; return null;
} }
@ -644,7 +632,7 @@ namespace Emby.Server.Implementations.HttpServer
}; };
} }
_logger.LogError("Could not find handler for {PathInfo}", pathInfo); Logger.LogError("Could not find handler for {PathInfo}", pathInfo);
return null; return null;
} }
@ -696,7 +684,7 @@ namespace Emby.Server.Implementations.HttpServer
ServiceController = new ServiceController(); ServiceController = new ServiceController();
_logger.LogInformation("Calling ServiceStack AppHost.Init"); Logger.LogInformation("Calling ServiceStack AppHost.Init");
var types = services.Select(r => r.GetType()).ToArray(); var types = services.Select(r => r.GetType()).ToArray();
@ -704,7 +692,7 @@ namespace Emby.Server.Implementations.HttpServer
ResponseFilters = new Action<IRequest, IResponse, object>[] ResponseFilters = new Action<IRequest, IResponse, object>[]
{ {
new ResponseFilter(_logger).FilterResponse new ResponseFilter(Logger).FilterResponse
}; };
} }
@ -834,7 +822,7 @@ namespace Emby.Server.Implementations.HttpServer
return Task.CompletedTask; return Task.CompletedTask;
} }
_logger.LogDebug("Websocket message received: {0}", result.MessageType); Logger.LogDebug("Websocket message received: {0}", result.MessageType);
var tasks = _webSocketListeners.Select(i => Task.Run(async () => var tasks = _webSocketListeners.Select(i => Task.Run(async () =>
{ {
@ -844,7 +832,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "{0} failed processing WebSocket message {1}", i.GetType().Name, result.MessageType ?? string.Empty); Logger.LogError(ex, "{0} failed processing WebSocket message {1}", i.GetType().Name, result.MessageType ?? string.Empty);
} }
})); }));