X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fdispatch.py;h=10cc2f6ef8014d451e330ebdf9119eee00bf3627;hb=10ba659d32518d2d09b12ada86a380798b378fe7;hp=b6009af680a3ed302c5a5b201ec7882ca35ac7fb;hpb=c33f2d6c068bf96c56e8e6966340f5f6e448df96;p=wrw.git diff --git a/wrw/dispatch.py b/wrw/dispatch.py index b6009af..10cc2f6 100644 --- a/wrw/dispatch.py +++ b/wrw/dispatch.py @@ -1,3 +1,6 @@ +import sys, traceback +from . import env, req, proto + __all__ = ["restart"] class restart(Exception): @@ -13,16 +16,66 @@ 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): + from . import resp + traceback.print_exception(*excinfo) + raise resp.httperror(500) + +def wraphandler(handler, excinfo): + def wrapped(req): + return handler(req, excinfo) + return wrapped + +errorhandler = env.var(defaulterror) + def handle(req, startreq, handler): + eh = errorhandler.val try: resp = [""] while True: try: - resp = handler(req) + resp = iterproxy(handler(req)) break except restart as i: handler = i.handle + except Exception as 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)