Changed log messages to be a bit more descriptive

This commit is contained in:
Marc Denman 2017-03-13 17:23:09 +00:00
parent 0ec7fc44ad
commit 3fb83077fb
2 changed files with 75 additions and 72 deletions

View File

@ -6,6 +6,9 @@ using Ocelot.Logging;
namespace Ocelot.Errors.Middleware namespace Ocelot.Errors.Middleware
{ {
/// <summary>
/// Catches all unhandled exceptions thrown by middleware, logs and returns a 500
/// </summary>
public class ExceptionHandlerMiddleware public class ExceptionHandlerMiddleware
{ {
private readonly RequestDelegate _next; private readonly RequestDelegate _next;

View File

@ -1,7 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Ocelot.Errors; using Ocelot.Errors;
using Ocelot.Infrastructure.RequestData; using Ocelot.Infrastructure.RequestData;
using Ocelot.Logging; using Ocelot.Logging;
@ -9,6 +8,9 @@ using Ocelot.Middleware;
namespace Ocelot.Responder.Middleware namespace Ocelot.Responder.Middleware
{ {
/// <summary>
/// Completes and returns the request and request body, if any pipeline errors occured then sets the appropriate HTTP status code instead.
/// </summary>
public class ResponderMiddleware : OcelotMiddleware public class ResponderMiddleware : OcelotMiddleware
{ {
private readonly RequestDelegate _next; private readonly RequestDelegate _next;
@ -32,28 +34,26 @@ namespace Ocelot.Responder.Middleware
public async Task Invoke(HttpContext context) public async Task Invoke(HttpContext context)
{ {
_logger.LogDebug("started error responder middleware"); _logger.LogDebug($"entered {this.GetType().Name}");
_logger.LogDebug($"invoking next middleware from {this.GetType().Name}");
await _next.Invoke(context); await _next.Invoke(context);
_logger.LogDebug("calling next middleware"); _logger.LogDebug($"returned to {this.GetType().Name} after next middleware completed");
if (PipelineError) if (PipelineError)
{ {
_logger.LogDebug("there is a pipeline error, getting errors");
var errors = PipelineErrors; var errors = PipelineErrors;
_logger.LogDebug($"{errors.Count} pipeline errors found in {this.GetType().Name}. Setting error response status code");
_logger.LogDebug("received errors setting error response");
SetErrorResponse(context, errors); SetErrorResponse(context, errors);
} }
else else
{ {
_logger.LogDebug("no pipeline error, setting response"); _logger.LogDebug("no pipeline errors, setting and returning completed response");
await _responder.SetResponseOnHttpContext(context, HttpResponseMessage); await _responder.SetResponseOnHttpContext(context, HttpResponseMessage);
} }
_logger.LogDebug($"completed {this.GetType().Name}");
} }
private void SetErrorResponse(HttpContext context, List<Error> errors) private void SetErrorResponse(HttpContext context, List<Error> errors)