From 6e2b94dde3b6b64dc62e5c00ebf1bc096fbb7e50 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 24 Oct 2014 12:15:07 -0700 Subject: [PATCH] #76 - Suppress shutdown error logs. --- src/Microsoft.AspNet.Server.WebListener/LogHelper.cs | 5 +++++ .../MessagePump.cs | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs index 28559308b6..2501c20620 100644 --- a/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs +++ b/src/Microsoft.AspNet.Server.WebListener/LogHelper.cs @@ -64,6 +64,11 @@ namespace Microsoft.AspNet.Server.WebListener } } + internal static void LogVerbose(ILogger logger, string location, Exception exception) + { + LogVerbose(logger, location + "; " + exception.ToString()); + } + internal static void LogException(ILogger logger, string location, Exception exception) { if (logger == null) diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs index c02513be2f..a6089cb400 100644 --- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs +++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs @@ -123,8 +123,15 @@ namespace Microsoft.AspNet.Server.WebListener } catch (Exception exception) { - LogHelper.LogException(_logger, "ListenForNextRequestAsync", exception); - Contract.Assert(!_listener.IsListening); + Contract.Assert(_stopping); + if (_stopping) + { + LogHelper.LogVerbose(_logger, "ListenForNextRequestAsync-Stopping", exception); + } + else + { + LogHelper.LogException(_logger, "ListenForNextRequestAsync", exception); + } return; } try @@ -197,6 +204,7 @@ namespace Microsoft.AspNet.Server.WebListener public void Dispose() { + LogHelper.LogInfo(_logger, "Stop"); _stopping = true; // Wait for active requests to drain if (_outstandingRequests > 0)