Handle RuntimeError from transport #1790

CHANGES.rst

@@ -15,6 +15,8 @@ Changes
 
 - Cancel websocket heartbeat on close #1793
 
+- Handle RuntimeError from transport #1790
+
 - Dropped "%O" in access logger #1673
 
 

aiohttp/web_protocol.py

@@ -467,6 +467,11 @@ def start(self, message, payload, handler):
                         self.log_debug('Uncompleted request.')
                         self.close()
 
+            except RuntimeError as exc:
+                if self.debug:
+                    self.log_exception(
+                        'Unhandled runtime exception', exc_info=exc)
+                self.force_close()
             except Exception as exc:
                 self.log_exception('Unhandled exception', exc_info=exc)
                 self.force_close()

tests/test_web_protocol.py

@@ -340,6 +340,33 @@ def test_handle_error__utf(make_srv, buf, transport, loop, request_handler):
         "Error handling request", exc_info=mock.ANY)
 
 
+@asyncio.coroutine
+def test_unhandled_runtime_error(make_srv, loop, transport, request_handler):
+
+    @asyncio.coroutine
+    def handle(request):
+        resp = web.Response()
+        resp.write_eof = mock.Mock()
+        resp.write_eof.side_effect = RuntimeError
+        return resp
+
+    srv = make_srv(lingering_time=0)
+    srv.debug = True
+    srv.connection_made(transport)
+    srv.logger.exception = mock.Mock()
+    request_handler.side_effect = handle
+
+    srv.data_received(
+        b'GET / HTTP/1.0\r\n'
+        b'Host: example.com\r\n'
+        b'Content-Length: 0\r\n\r\n')
+
+    yield from srv._request_handlers[0]
+    assert request_handler.called
+    srv.logger.exception.assert_called_with(
+        "Unhandled runtime exception", exc_info=mock.ANY)
+
+
 @asyncio.coroutine
 def test_handle_uncompleted(
         make_srv, loop, transport, handle_with_error, request_handler):