#150 Handle OperationCancelledExceptions to prevent log noise

aspnet · Aug 26, 2016 · 111eb1a · 111eb1a
1 parent 33dbd6d
commit 111eb1a
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 28 deletions.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
@@ -25,6 +25,7 @@ internal static class LoggerExtensions
         private static Action<ILogger, StringValues, string, Exception> _logCopyingFileRange;
         private static Action<ILogger, long, string, string, Exception> _logCopyingBytesToResponse;
         private static Action<ILogger, string, Exception> _logMultipleFileRanges;
+        private static Action<ILogger, Exception> _logWriteCancelled;
 
         static LoggerExtensions()
         {
@@ -80,6 +81,10 @@ static LoggerExtensions()
                 logLevel: LogLevel.Warning,
                 eventId: 13,
                 formatString: "Multiple ranges are not allowed: '{Ranges}'");
+            _logWriteCancelled = LoggerMessage.Define(
+                logLevel: LogLevel.Debug,
+                eventId: 14,
+                formatString: "The file transmission was cancelled");
         }
 
         public static void LogRequestMethodNotSupported(this ILogger logger, string method)
@@ -155,5 +160,10 @@ public static void LogMultipleFileRanges(this ILogger logger, string range)
         {
             _logMultipleFileRanges(logger, range, null);
         }
+
+        public static void LogWriteCancelled(this ILogger logger, Exception ex)
+        {
+            _logWriteCancelled(logger, ex);
+        }
     }
 }
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
@@ -346,23 +346,39 @@ public async Task SendAsync()
         {
             ApplyResponseHeaders(Constants.Status200Ok);
 
-            string physicalPath = _fileInfo.PhysicalPath;
-            var sendFile = _context.Features.Get<IHttpSendFileFeature>();
-            if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
-            {
-                await sendFile.SendFileAsync(physicalPath, 0, _length, _context.RequestAborted);
-                return;
-            }
-
-            Stream readStream = _fileInfo.CreateReadStream();
             try
             {
-                // Larger StreamCopyBufferSize is required because in case of FileStream readStream isn't going to be buffering
-                await StreamCopyOperation.CopyToAsync(readStream, _response.Body, _length, StreamCopyBufferSize, _context.RequestAborted);
+                string physicalPath = _fileInfo.PhysicalPath;
+                var sendFile = _context.Features.Get<IHttpSendFileFeature>();
+                if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
+                {
+                    await sendFile.SendFileAsync(physicalPath, 0, _length, _context.RequestAborted);
+                    return;
+                }
+
+                Stream readStream = _fileInfo.CreateReadStream();
+                try
+                {
+                    // Larger StreamCopyBufferSize is required because in case of FileStream readStream isn't going to be buffering
+                    await StreamCopyOperation.CopyToAsync(readStream, _response.Body, _length, StreamCopyBufferSize, _context.RequestAborted);
+                }
+                finally
+                {
+                    readStream.Dispose();
+                }
             }
-            finally
+            catch (OperationCanceledException ex)
             {
-                readStream.Dispose();
+                _logger.LogWriteCancelled(ex);
+                if (_context.Response.HasStarted)
+                {
+                    _context.Abort();
+                }
+                else
+                {
+                    _context.Response.Clear();
+                    _context.Response.StatusCode = StatusCodes.Status500InternalServerError;
+                }
             }
         }
 
@@ -395,25 +411,41 @@ internal async Task SendRangeAsync()
             _response.ContentLength = length;
             ApplyResponseHeaders(Constants.Status206PartialContent);
 
-            string physicalPath = _fileInfo.PhysicalPath;
-            var sendFile = _context.Features.Get<IHttpSendFileFeature>();
-            if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
-            {
-                _logger.LogSendingFileRange(_response.Headers[HeaderNames.ContentRange], physicalPath);
-                await sendFile.SendFileAsync(physicalPath, start, length, _context.RequestAborted);
-                return;
-            }
-
-            Stream readStream = _fileInfo.CreateReadStream();
             try
             {
-                readStream.Seek(start, SeekOrigin.Begin); // TODO: What if !CanSeek?
-                _logger.LogCopyingFileRange(_response.Headers[HeaderNames.ContentRange], SubPath);
-                await StreamCopyOperation.CopyToAsync(readStream, _response.Body, length, _context.RequestAborted);
+                string physicalPath = _fileInfo.PhysicalPath;
+                var sendFile = _context.Features.Get<IHttpSendFileFeature>();
+                if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
+                {
+                    _logger.LogSendingFileRange(_response.Headers[HeaderNames.ContentRange], physicalPath);
+                    await sendFile.SendFileAsync(physicalPath, start, length, _context.RequestAborted);
+                    return;
+                }
+
+                Stream readStream = _fileInfo.CreateReadStream();
+                try
+                {
+                    readStream.Seek(start, SeekOrigin.Begin); // TODO: What if !CanSeek?
+                    _logger.LogCopyingFileRange(_response.Headers[HeaderNames.ContentRange], SubPath);
+                    await StreamCopyOperation.CopyToAsync(readStream, _response.Body, length, _context.RequestAborted);
+                }
+                finally
+                {
+                    readStream.Dispose();
+                }
             }
-            finally
+            catch (OperationCanceledException ex)
             {
-                readStream.Dispose();
+                _logger.LogWriteCancelled(ex);
+                if (_context.Response.HasStarted)
+                {
+                    _context.Abort();
+                }
+                else
+                {
+                    _context.Response.Clear();
+                    _context.Response.StatusCode = StatusCodes.Status500InternalServerError;
+                }
             }
         }