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

improved http server error handling

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-15 17:38:17 -04:00
parent 43f7f34b5d
commit 3a1317fd4f
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
View File

@ -330,6 +330,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
throw; throw;
} }
finally
{
context.Response.Close();
}
} }
/// <summary> /// <summary>
@ -353,7 +357,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
_logger.ErrorException("AcceptWebSocketAsync error", ex); _logger.ErrorException("AcceptWebSocketAsync error", ex);
ctx.Response.StatusCode = 500; ctx.Response.StatusCode = 500;
ctx.Response.Close(); }
finally
{
ctx.Response.Close();
} }
} }
@ -386,26 +393,26 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{ {
_logger.ErrorException("Error processing request", ex); _logger.ErrorException("Error processing request", ex);
response.StatusCode = statusCode;
response.Headers.Add("Status", statusCode.ToString(new CultureInfo("en-US")));
response.Headers.Remove("Age");
response.Headers.Remove("Expires");
response.Headers.Remove("Cache-Control");
response.Headers.Remove("Etag");
response.Headers.Remove("Last-Modified");
response.ContentType = "text/plain";
if (!string.IsNullOrEmpty(ex.Message))
{
response.AddHeader("X-Application-Error-Code", ex.Message);
}
// This could fail, but try to add the stack trace as the body content // This could fail, but try to add the stack trace as the body content
try try
{ {
response.StatusCode = statusCode;
response.Headers.Add("Status", statusCode.ToString(new CultureInfo("en-US")));
response.Headers.Remove("Age");
response.Headers.Remove("Expires");
response.Headers.Remove("Cache-Control");
response.Headers.Remove("Etag");
response.Headers.Remove("Last-Modified");
response.ContentType = "text/plain";
if (!string.IsNullOrEmpty(ex.Message))
{
response.AddHeader("X-Application-Error-Code", ex.Message);
}
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine("{"); sb.AppendLine("{");
sb.AppendLine("\"ResponseStatus\":{"); sb.AppendLine("\"ResponseStatus\":{");
@ -415,11 +422,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
sb.AppendLine("}"); sb.AppendLine("}");
sb.AppendLine("}"); sb.AppendLine("}");
response.StatusCode = 500;
response.ContentType = ContentType.Json; response.ContentType = ContentType.Json;
var sbBytes = sb.ToString().ToUtf8Bytes(); var sbBytes = sb.ToString().ToUtf8Bytes();
response.OutputStream.Write(sbBytes, 0, sbBytes.Length); response.OutputStream.Write(sbBytes, 0, sbBytes.Length);
response.Close();
} }
catch (Exception errorEx) catch (Exception errorEx)
{ {
@ -457,7 +462,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
} }
serviceStackHandler.ProcessRequest(httpReq, httpRes, operationName); serviceStackHandler.ProcessRequest(httpReq, httpRes, operationName);
LogResponse(context, url, endPoint); LogResponse(context, url, endPoint);
httpRes.Close();
return; return;
} }