refactor error_500

tremolo/asgi_server.py

@@ -10,6 +10,7 @@
     WebSocketClientClosed,
     WebSocketServerClosed
 )
+from .handlers import error_500
 from .lib.contexts import ServerContext
 from .lib.http_protocol import HTTPProtocol
 from .lib.websocket import WebSocket
@@ -85,6 +86,9 @@ async def headers_received(self):
         # update the handler with the ASGI main task
         self.handler = self.loop.create_task(self.main())
 
+    async def handle_error_500(self, exc):
+        return await error_500(request=self.request, exc=exc)
+
     def connection_lost(self, exc):
         if self.handler is not None and not self.handler.done():
             self._set_app_close_timeout()

tremolo/http_server.py

@@ -10,9 +10,9 @@
 class HTTPServer(HTTPProtocol):
     __slots__ = ('_routes', '_middlewares', '_server')
 
-    def __init__(self, lock=None, **kwargs):
-        self._routes = kwargs['_routes']
-        self._middlewares = kwargs['_middlewares']
+    def __init__(self, _routes=None, _middlewares=None, lock=None, **kwargs):
+        self._routes = _routes
+        self._middlewares = _middlewares
         self._server = {
             'loop': kwargs['loop'],
             'logger': kwargs['logger'],
@@ -355,3 +355,9 @@ async def headers_received(self):
             self._routes[0][1][1],
             {**self._routes[0][1][2], **options}
         )
+
+    async def handle_error_500(self, exc):
+        # internal server error
+        return await self._routes[0][-1][1](request=self.request,
+                                            response=self.response,
+                                            exc=exc)

tremolo/lib/http_protocol.py

@@ -153,6 +153,9 @@
     async def headers_received(self):
         return
 
+    async def handle_error_500(self, exc):
+        return
+
     def handler_timeout(self):
         if (self.request is None or self.request.upgraded or
                 self.handler is None):
@@ -206,8 +209,7 @@
             data = b''
 
             try:
-                data = await self.options['_routes'][0][-1][1](
-                    request=self.request, response=self.response, exc=exc)
+                data = await self.handle_error_500(exc)
 
                 if data is None:
                     data = b''