From: Tom Christie <tom@tomchristie.com>
Date: Wed, 18 Jul 2018 14:34:13 +0000 (+0100)
Subject: Show exceptions that occur during app init. Ignore non-http scopes.
X-Git-Tag: 0.1.14~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F31%2Fhead;p=thirdparty%2Fstarlette.git

Show exceptions that occur during app init. Ignore non-http scopes.
---

diff --git a/starlette/debug.py b/starlette/debug.py
index d40c6d3f..eb1455a0 100644
--- a/starlette/debug.py
+++ b/starlette/debug.py
@@ -9,19 +9,22 @@ class DebugMiddleware:
         self.app = app
 
     def __call__(self, scope):
+        if scope["type"] != "http":
+            return self.app(scope)
         return _DebugResponder(self.app, scope)
 
 
 class _DebugResponder:
     def __init__(self, app, scope):
+        self.app = app
         self.scope = scope
-        self.asgi_instance = app(scope)
         self.response_started = False
 
     async def __call__(self, receive, send):
         self.raw_send = send
         try:
-            await self.asgi_instance(receive, self.send)
+            asgi = self.app(self.scope)
+            await asgi(receive, self.send)
         except:
             if self.response_started:
                 raise
diff --git a/tests/test_debug.py b/tests/test_debug.py
index 8694bb09..fffeec93 100644
--- a/tests/test_debug.py
+++ b/tests/test_debug.py
@@ -43,3 +43,25 @@ def test_debug_after_response_sent():
     client = TestClient(DebugMiddleware(app))
     with pytest.raises(RuntimeError):
         response = client.get("/")
+
+
+def test_debug_error_during_scope():
+    def app(scope):
+        raise RuntimeError("Something went wrong")
+
+    app = DebugMiddleware(app)
+    client = TestClient(DebugMiddleware(app))
+    response = client.get("/", headers={"Accept": "text/html, */*"})
+    assert response.status_code == 500
+    assert response.headers["content-type"].startswith("text/html")
+    assert "RuntimeError" in response.text
+
+
+def test_debug_not_http():
+    def app(scope):
+        raise RuntimeError("Something went wrong")
+
+    app = DebugMiddleware(app)
+
+    with pytest.raises(RuntimeError):
+        app({"type": "websocket"})