X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python3%2Fashd-wsgi3;fp=python3%2Fashd-wsgi3;h=fa0b8b590d2f71cecd4afbaa1fe989af0927432d;hp=8944b5ce1fe9bc2a30aef9427ab36e25b2063596;hb=bcad6b0c48d516ddc920b52f06083ceaa242e1ca;hpb=589987f8218c9aa61d65f582a3b3e1bbd32bda81 diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3 index 8944b5c..fa0b8b5 100755 --- a/python3/ashd-wsgi3 +++ b/python3/ashd-wsgi3 @@ -1,19 +1,19 @@ #!/usr/bin/python3 -import sys, os, getopt, threading, logging, time, locale, collections -import ashd.proto, ashd.util, ashd.perf +import sys, os, getopt, socket, logging, time, locale, collections, signal +import ashd.util, ashd.serve, ashd.htlib try: import pdm.srv except: pdm = None def usage(out): - out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n") + out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n") -reqlimit = 0 +hspec = "free", {} modwsgi_compat = False setlog = True -opts, args = getopt.getopt(sys.argv[1:], "+hALp:l:m:") +opts, args = getopt.getopt(sys.argv[1:], "+hALp:t:l:m:") for o, a in opts: if o == "-h": usage(sys.stdout) @@ -25,7 +25,9 @@ for o, a in opts: elif o == "-A": modwsgi_compat = True elif o == "-l": - reqlimit = int(a) + hspec = "free", {"max": a, "abort": "10"} + elif o == "-t": + hspec = ashd.serve.parsehspec(a) elif o == "-m": if pdm is not None: pdm.srv.listen(a) @@ -52,10 +54,6 @@ else: sys.exit(1) handler = handlermod.application -class closed(IOError): - def __init__(self): - super().__init__("The client has closed the connection.") - cwd = os.getcwd() def absolutify(path): if path[0] != '/': @@ -95,7 +93,7 @@ def unquoteurl(url): buf.append(c) return buf -def dowsgi(req): +def mkenv(req): env = {} env["wsgi.version"] = 1, 0 for key, val in req.headers: @@ -147,103 +145,82 @@ def dowsgi(req): env["wsgi.multithread"] = True env["wsgi.multiprocess"] = False env["wsgi.run_once"] = False + return env - resp = [] - respsent = [] - - def recode(thing): - if isinstance(thing, collections.ByteString): - return thing - else: - return str(thing).encode("latin-1") - - def flushreq(): - if not respsent: - if not resp: - raise Exception("Trying to write data before starting response.") - status, headers = resp - respsent[:] = [True] - buf = bytearray() - buf += b"HTTP/1.1 " + recode(status) + b"\n" - for nm, val in headers: - buf += recode(nm) + b": " + recode(val) + b"\n" - buf += b"\n" - try: - req.sk.write(buf) - except IOError: - raise closed() - - def write(data): - if not data: - return - flushreq() +def recode(thing): + if isinstance(thing, collections.ByteString): + return thing + else: + return str(thing).encode("latin-1") + +class request(ashd.serve.wsgirequest): + def __init__(self, *, bkreq, **kw): + super().__init__(**kw) + self.bkreq = bkreq.dup() + self.sendrights = None + + def mkenv(self): + return mkenv(self.bkreq) + + def handlewsgi(self, env, startreq): + return handler(env, startreq) + + def fileno(self): + return self.bkreq.bsk.fileno() + + def writehead(self, status, headers): + headers = list(headers) + for header in headers: + nm, val = header + if nm.lower() == "x-ash-send-rights": + self.sendrights = val + headers.remove(header) + break + w = self.buffer.extend + w(b"HTTP/1.1 " + recode(status) + b"\n") + for nm, val in headers: + w(recode(nm) + b": " + recode(val) + b"\n") + w(b"\n") + + def flush(self): try: - req.sk.write(data) - req.sk.flush() - except IOError: - raise closed() - - def startreq(status, headers, exc_info = None): - if resp: - if exc_info: # Interesting, this... - try: - if respsent: - raise exc_info[1] - finally: - exc_info = None # CPython GC bug? + if self.sendrights is not None: + ret = ashd.htlib.sendfd(self.bkreq.bsk.fileno(), self.sendrights.fileno(), self.buffer) + self.sendrights.close() + self.sendrights = None else: - raise Exception("Can only start responding once.") - resp[:] = status, headers - return write + ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT) + self.buffer[:ret] = b"" + except IOError: + raise ashd.serve.closed() - with ashd.perf.request(env) as reqevent: - try: - respiter = handler(env, startreq) - try: - for data in respiter: - write(data) - if resp: - flushreq() - finally: - if hasattr(respiter, "close"): - respiter.close() - except closed: - pass - if resp: - reqevent.response(resp) - -flightlock = threading.Condition() -inflight = 0 - -class reqthread(threading.Thread): - def __init__(self, req): - super().__init__(name = "Request handler") - self.req = req.dup() - - def run(self): - global inflight + def close(self): try: - with flightlock: - if reqlimit != 0: - start = time.time() - while inflight >= reqlimit: - flightlock.wait(10) - if time.time() - start > 10: - os.abort() - inflight += 1 - try: - dowsgi(self.req) - finally: - with flightlock: - inflight -= 1 - flightlock.notify() - except: - log.error("exception occurred in handler thread", exc_info=True) + self.bkreq.close() finally: - self.req.close() - sys.stderr.flush() - + if self.sendrights is not None: + self.sendrights.close() + def handle(req): - reqthread(req).start() + reqhandler.handle(request(bkreq=req, handler=reqhandler)) -ashd.util.serveloop(handle) +if hspec[0] not in ashd.serve.names: + sys.stderr.write("ashd-wsgi3: no such request handler: %s\n" % hspec[0]) + sys.exit(1) +hclass = ashd.serve.names[hspec[0]] +try: + hargs = hclass.parseargs(**hspec[1]) +except ValueError as exc: + sys.stderr.write("ashd-wsgi3: %s\n" % exc) + sys.exit(1) + +def sigterm(sig, frame): + socket.fromfd(0, socket.AF_UNIX, socket.SOCK_SEQPACKET).shutdown(socket.SHUT_RDWR) # :P +for signum in [signal.SIGINT, signal.SIGTERM]: + signal.signal(signum, sigterm) + +reqhandler = hclass(**hargs) +try: + ashd.util.serveloop(handle) +finally: + reqhandler.close()