huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Log all startup errors in KestrelServer

This commit is contained in:
Stephen Halter 2016-08-18 10:42:01 -07:00
parent 972be6e8c1
commit 7bd30ea693
3 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Microsoft.AspNetCore.Server.Kestrel/KestrelServer.cs
View File

@ -56,17 +56,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel
public void Start<TContext>(IHttpApplication<TContext> application)
{
ValidateOptions();
if (_disposables != null)
{
// The server has already started and/or has not been cleaned up yet
throw new InvalidOperationException("Server has already started.");
}
_disposables = new Stack<IDisposable>();
try
{
ValidateOptions();
if (_disposables != null)
{
// The server has already started and/or has not been cleaned up yet
throw new InvalidOperationException("Server has already started.");
}
_disposables = new Stack<IDisposable>();
var dateHeaderValueManager = new DateHeaderValueManager();
var trace = new KestrelTrace(_logger);
var engine = new KestrelEngine(new ServiceContext
@ -180,8 +180,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel
throw new InvalidOperationException("No recognized listening addresses were configured.");
}
}
catch
catch (Exception ex)
{
_logger.LogCritical(0, ex, "Unable to start Kestrel.");
Dispose();
throw;
}

46
test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
View File

@ -21,32 +21,38 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
[InlineData(-1337)]
public void StartWithNonPositiveThreadCountThrows(int threadCount)
{
var server = CreateServer(new KestrelServerOptions() { ThreadCount = threadCount });
var testLogger = new TestApplicationErrorLogger();
var server = CreateServer(new KestrelServerOptions() { ThreadCount = threadCount }, testLogger);
var exception = Assert.Throws<ArgumentOutOfRangeException>(() => StartDummyApplication(server));
Assert.Equal("threadCount", exception.ParamName);
Assert.Equal(1, testLogger.CriticalErrorsLogged);
}
[Fact]
public void StartWithInvalidAddressThrows()
{
var server = CreateServer(new KestrelServerOptions());
var testLogger = new TestApplicationErrorLogger();
var server = CreateServer(new KestrelServerOptions(), testLogger);
server.Features.Get<IServerAddressesFeature>().Addresses.Add("http:/asdf");
var exception = Assert.Throws<FormatException>(() => StartDummyApplication(server));
Assert.Contains("Invalid URL", exception.Message);
Assert.Equal(1, testLogger.CriticalErrorsLogged);
}
[Fact]
public void StartWithEmptyAddressesThrows()
{
var server = CreateServer(new KestrelServerOptions());
var testLogger = new TestApplicationErrorLogger();
var server = CreateServer(new KestrelServerOptions(), testLogger);
var exception = Assert.Throws<InvalidOperationException>(() => StartDummyApplication(server));
Assert.Equal("No recognized listening addresses were configured.", exception.Message);
Assert.Equal(1, testLogger.CriticalErrorsLogged);
}
[Theory]
@ -54,30 +60,56 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
[InlineData(int.MaxValue - 1, int.MaxValue)]
public void StartWithMaxRequestBufferSizeLessThanMaxRequestLineSizeThrows(long maxRequestBufferSize, int maxRequestLineSize)
{
var testLogger = new TestApplicationErrorLogger();
var options = new KestrelServerOptions();
options.Limits.MaxRequestBufferSize = maxRequestBufferSize;
options.Limits.MaxRequestLineSize = maxRequestLineSize;
var server = CreateServer(options);
var server = CreateServer(options, testLogger);
var exception = Assert.Throws<InvalidOperationException>(() => StartDummyApplication(server));
Assert.Equal(
$"Maximum request buffer size ({maxRequestBufferSize}) must be greater than or equal to maximum request line size ({maxRequestLineSize}).",
exception.Message);
Assert.Equal(1, testLogger.CriticalErrorsLogged);
}
private static KestrelServer CreateServer(KestrelServerOptions options)
private static KestrelServer CreateServer(KestrelServerOptions options, ILogger testLogger)
{
var lifetime = new LifetimeNotImplemented();
var logger = new LoggerFactory();
return new KestrelServer(Options.Create(options), lifetime, logger);
return new KestrelServer(Options.Create(options), lifetime, new TestLoggerFactory(testLogger));
}
private static void StartDummyApplication(IServer server)
{
server.Start(new DummyApplication(context => TaskUtilities.CompletedTask));
}
private class TestLoggerFactory : ILoggerFactory
{
private readonly ILogger _testLogger;
public TestLoggerFactory(ILogger testLogger)
{
_testLogger = testLogger;
}
public ILogger CreateLogger(string categoryName)
{
return _testLogger;
}
public void AddProvider(ILoggerProvider provider)
{
throw new NotImplementedException();
}
public void Dispose()
{
throw new NotImplementedException();
}
}
}
}

7
test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/TestApplicationErrorLogger.cs
View File

@ -15,6 +15,8 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
public int TotalErrorsLogged { get; set; }
public int CriticalErrorsLogged { get; set; }
public int ApplicationErrorsLogged { get; set; }
public IDisposable BeginScope<TState>(TState state)
@ -42,6 +44,11 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
{
TotalErrorsLogged++;
}
if (logLevel == LogLevel.Critical)
{
CriticalErrorsLogged++;
}
}
}
}