X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python3%2Fashd-wsgi3;h=40a37224783c24e0eb21c7fd2bf6b323707e5b99;hb=4881876d599616e6f010d244e4c15c4b3a6f2974;hp=0e562ecacca7aeb7749e103ba6ebe3f8e629f247;hpb=d5ee5cdea79ab756f4a7908c19b8232d57a1a3a8;p=ashd.git diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3 index 0e562ec..40a3722 100755 --- a/python3/ashd-wsgi3 +++ b/python3/ashd-wsgi3 @@ -1,24 +1,27 @@ #!/usr/bin/python3 -import sys, os, getopt, threading, time, locale, collections -import ashd.proto, ashd.util, ashd.perf +import sys, os, getopt, threading, logging, time, locale, collections +import ashd.proto, ashd.util, ashd.perf, ashd.serve try: import pdm.srv except: pdm = None def usage(out): - out.write("usage: ashd-wsgi3 [-hA] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n") + out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n") reqlimit = 0 modwsgi_compat = False -opts, args = getopt.getopt(sys.argv[1:], "+hAp:l:m:") +setlog = True +opts, args = getopt.getopt(sys.argv[1:], "+hALp:l:m:") for o, a in opts: if o == "-h": usage(sys.stdout) sys.exit(0) elif o == "-p": sys.path.insert(0, a) + elif o == "-L": + setlog = False elif o == "-A": modwsgi_compat = True elif o == "-l": @@ -29,6 +32,9 @@ for o, a in opts: if len(args) < 1: usage(sys.stderr) sys.exit(1) +if setlog: + logging.basicConfig(format="ashd-wsgi3(%(name)s): %(levelname)s: %(message)s") +log = logging.getLogger("ashd-wsgi3") try: handlermod = __import__(args[0], fromlist = ["dummy"]) @@ -46,10 +52,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] != '/': @@ -89,7 +91,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: @@ -125,10 +127,15 @@ def dowsgi(req): name = "" env["SCRIPT_NAME"] = name env["PATH_INFO"] = pi - for src, tgt in [("HTTP_HOST", "SERVER_NAME"), ("HTTP_X_ASH_SERVER_PORT", "SERVER_PORT"), - ("HTTP_X_ASH_ADDRESS", "REMOTE_ADDR"), ("HTTP_CONTENT_TYPE", "CONTENT_TYPE"), - ("HTTP_CONTENT_LENGTH", "CONTENT_LENGTH"), ("HTTP_X_ASH_PROTOCOL", "wsgi.url_scheme")]: + for src, tgt in [("HTTP_HOST", "SERVER_NAME"), ("HTTP_X_ASH_PROTOCOL", "wsgi.url_scheme"), + ("HTTP_X_ASH_SERVER_ADDRESS", "SERVER_ADDR"), ("HTTP_X_ASH_SERVER_PORT", "SERVER_PORT"), + ("HTTP_X_ASH_ADDRESS", "REMOTE_ADDR"), ("HTTP_X_ASH_PORT", "REMOTE_PORT"), + ("HTTP_CONTENT_TYPE", "CONTENT_TYPE"), ("HTTP_CONTENT_LENGTH", "CONTENT_LENGTH")]: if src in env: env[tgt] = env[src] + for key in ["HTTP_CONTENT_TYPE", "HTTP_CONTENT_LENGTH"]: + # The CGI specification does not strictly require this, but + # many actualy programs and libraries seem to. + if key in env: del env[key] if "X-Ash-Protocol" in req and req["X-Ash-Protocol"] == b"https": env["HTTPS"] = "on" if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"].decode(locale.getpreferredencoding())) env["wsgi.input"] = req.sk @@ -136,96 +143,55 @@ def dowsgi(req): env["wsgi.multithread"] = True env["wsgi.multiprocess"] = False env["wsgi.run_once"] = False + return env - resp = [] - respsent = [] +if reqlimit != 0: + guard = ashd.serve.calllimiter(reqlimit).call +else: + guard = lambda fun: fun() - def recode(thing): - if isinstance(thing, collections.ByteString): - return thing - else: - return str(thing).encode("latin-1") +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() +class reqthread(ashd.serve.wsgithread): + def __init__(self, req): + super().__init__(name = "Request handler") + self.req = req.dup() - def write(data): - if not data: - return - flushreq() + def handlewsgi(self): + return handler(self.env, self.startreq) + + def writehead(self, status, headers): + 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(data) - req.sk.flush() + self.req.sk.write(buf) except IOError: - raise closed() + raise ashd.serve.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? - else: - raise Exception("Can only start responding once.") - resp[:] = status, headers - return write - - with ashd.perf.request(env) as reqevent: - respiter = handler(env, startreq) + def writedata(self, data): try: - try: - for data in respiter: - write(data) - if resp: - flushreq() - except closed: - pass - finally: - if hasattr(respiter, "close"): - respiter.close() - 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() + self.req.sk.write(data) + self.req.sk.flush() + except IOError: + raise ashd.serve.closed() + + def handle(self): + self.env = mkenv(self.req) + with ashd.perf.request(self.env) as reqevent: + super().handle() + if self.status: + reqevent.response([self.status, self.headers]) def run(self): - global inflight 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() + guard(super().run) finally: self.req.close() sys.stderr.flush()