X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fdispatch.py;h=666d7a7cbd3fff980c10b3d53a55d900576f59c3;hp=fe62df33c4f75c3321aaea0cf039e810155ad816;hb=d9ce65914152036450263d9b0103c0b81f35e052;hpb=e8aa9ce29141768796b430fa8c6f95dce6e7a507

diff --git a/wrw/dispatch.py b/wrw/dispatch.py
index fe62df3..666d7a7 100644
--- a/wrw/dispatch.py
+++ b/wrw/dispatch.py
@@ -1,3 +1,6 @@
+import sys, traceback
+import env, req, proto
+
 __all__ = ["restart"]
 
 class restart(Exception):
@@ -13,42 +16,54 @@ def mangle(result):
         return result
     return [str(result)]
 
-class iterproxy(object):
-    # Makes sure iter(real).next() is called immediately, in order to
-    # let generator code run.
-    def __init__(self, real):
-        self.bk = real
-        self.bki = iter(real)
-        self._next = [None]
-        self.next()
-
-    def __iter__(self):
-        return self
-
-    def next(self):
-        if self._next is None:
-            raise StopIteration()
-        ret = self._next[0]
-        try:
-            self._next[:] = [self.bki.next()]
-        except StopIteration:
-            self._next = None
-        return ret
-
-    def close(self):
-        if hasattr(self.bk, "close"):
-            self.bk.close()
+def defaulterror(req, excinfo):
+    import resp
+    traceback.print_exception(*excinfo)
+    sys.stderr.flush()
+    raise resp.httperror(500)
+
+def wraphandler(handler, excinfo):
+    def wrapped(req):
+        return handler(req, excinfo)
+    wrapped.__wrapped__ = handler
+    return wrapped
+
+errorhandler = env.var(defaulterror)
 
 def handle(req, startreq, handler):
+    eh = errorhandler.val
     try:
         resp = [""]
         while True:
             try:
-                resp = iterproxy(handler(req))
+                resp = handler(req)
                 break
             except restart, i:
                 handler = i.handle
+            except Exception, i:
+                if eh is None:
+                    raise
+                handler = wraphandler(eh, sys.exc_info())
+                eh = None
         req.commit(startreq)
         return resp
     finally:
         req.cleanup()
+
+def handleenv(env, startreq, handler):
+    if not "HTTP_HOST" in env:
+        return proto.simpleerror(env, startreq, 400, "Bad Request", "Request must include Host header.")
+    r = req.origrequest(env)
+    return handle(r, startreq, handler)
+
+def exterror(env, startreq):
+    def handler(req):
+        import resp
+        code = 404
+        if "Response-Code" in req.ihead:
+            try:
+                code = int(req.ihead["Response-Code"])
+            except ValueError:
+                pass
+        raise resp.httperror(code)
+    return handleenv(env, startreq, handler)