diff --git a/samples/ErrorHandlerSample/Startup.cs b/samples/ErrorHandlerSample/Startup.cs index 3ebc4e2d57..04116029aa 100644 --- a/samples/ErrorHandlerSample/Startup.cs +++ b/samples/ErrorHandlerSample/Startup.cs @@ -22,7 +22,7 @@ namespace ErrorHandlerSample await context.Response.WriteAsync("\r\n"); await context.Response.WriteAsync("We're sorry, we encountered an un-expected issue with your application.
\r\n"); - var error = context.Features.Get(); + var error = context.Features.Get(); if (error != null) { // This error would not normally be exposed to the client diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/IErrorHandlerFeature.cs b/src/Microsoft.AspNet.Diagnostics.Abstractions/IExceptionHandlerFeature.cs similarity index 85% rename from src/Microsoft.AspNet.Diagnostics.Abstractions/IErrorHandlerFeature.cs rename to src/Microsoft.AspNet.Diagnostics.Abstractions/IExceptionHandlerFeature.cs index fa73e74789..8d73aa72d6 100644 --- a/src/Microsoft.AspNet.Diagnostics.Abstractions/IErrorHandlerFeature.cs +++ b/src/Microsoft.AspNet.Diagnostics.Abstractions/IExceptionHandlerFeature.cs @@ -5,7 +5,7 @@ using System; namespace Microsoft.AspNet.Diagnostics { - public interface IErrorHandlerFeature + public interface IExceptionHandlerFeature { Exception Error { get; } } diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPageExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/ErrorPageOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs rename to src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/ErrorPageOptions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageExtensions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageMiddleware.cs diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs rename to src/Microsoft.AspNet.Diagnostics/DiagnosticsPage/DiagnosticsPageOptions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorHandlerOptions.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ErrorHandlerOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/ErrorHandlerOptions.cs rename to src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ErrorHandlerOptions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandlerExtensions.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs similarity index 95% rename from src/Microsoft.AspNet.Diagnostics/ExceptionHandlerExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs index 67d2c1c54d..73436b635a 100644 --- a/src/Microsoft.AspNet.Diagnostics/ExceptionHandlerExtensions.cs +++ b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Builder { ErrorHandlingPath = new PathString(errorHandlingPath) }; - return app.UseMiddleware(options); + return app.UseMiddleware(options); } /// @@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Builder { ErrorHandler = errorPipeline }; - return app.UseMiddleware(options); + return app.UseMiddleware(options); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorHandlerFeature.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs similarity index 80% rename from src/Microsoft.AspNet.Diagnostics/ErrorHandlerFeature.cs rename to src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs index ca4481a712..1b841962d6 100644 --- a/src/Microsoft.AspNet.Diagnostics/ErrorHandlerFeature.cs +++ b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs @@ -5,7 +5,7 @@ using System; namespace Microsoft.AspNet.Diagnostics { - public class ErrorHandlerFeature : IErrorHandlerFeature + public class ExceptionHandlerFeature : IExceptionHandlerFeature { public Exception Error { get; set; } } diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorHandlerMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs similarity index 89% rename from src/Microsoft.AspNet.Diagnostics/ErrorHandlerMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs index 9e5cc81aeb..5fb70e4d51 100644 --- a/src/Microsoft.AspNet.Diagnostics/ErrorHandlerMiddleware.cs +++ b/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs @@ -11,18 +11,18 @@ using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Diagnostics { - public class ErrorHandlerMiddleware + public class ExceptionHandlerMiddleware { private readonly RequestDelegate _next; private readonly ErrorHandlerOptions _options; private readonly ILogger _logger; private readonly Func _clearCacheHeadersDelegate; - public ErrorHandlerMiddleware(RequestDelegate next, ILoggerFactory loggerFactory, ErrorHandlerOptions options) + public ExceptionHandlerMiddleware(RequestDelegate next, ILoggerFactory loggerFactory, ErrorHandlerOptions options) { _next = next; _options = options; - _logger = loggerFactory.CreateLogger(); + _logger = loggerFactory.CreateLogger(); if (_options.ErrorHandler == null) { _options.ErrorHandler = _next; @@ -53,11 +53,11 @@ namespace Microsoft.AspNet.Diagnostics } try { - var errorHandlerFeature = new ErrorHandlerFeature() + var errorHandlerFeature = new ExceptionHandlerFeature() { Error = ex, }; - context.Features.Set(errorHandlerFeature); + context.Features.Set(errorHandlerFeature); context.Response.StatusCode = 500; context.Response.Headers.Clear(); context.Response.OnStarting(_clearCacheHeadersDelegate, context.Response); diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs b/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfoExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfoPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfoPageOptions.cs rename to src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodeContext.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeContext.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodeContext.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeContext.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesFeature.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodePagesFeature.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodePagesMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodeReExecuteFeature.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/StatusCodeReExecuteFeature.cs rename to src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs rename to src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageExtensions.cs diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs rename to src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageMiddleware.cs diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs rename to src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageOptions.cs