X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fashd-wsgi;h=d5438fabb3a08718f2ddddbfda61c2e4bd76c666;hp=af2c332812fcb0f7fa2dd852965123dce501e424;hb=fd0303c3260c6397b33912312af67e7a99523926;hpb=d5ee5cdea79ab756f4a7908c19b8232d57a1a3a8 diff --git a/python/ashd-wsgi b/python/ashd-wsgi index af2c332..d5438fa 100755 --- a/python/ashd-wsgi +++ b/python/ashd-wsgi @@ -1,34 +1,42 @@ #!/usr/bin/python -import sys, os, getopt, threading, time -import ashd.proto, ashd.util, ashd.perf +import sys, os, getopt, socket, logging, time, signal +import ashd.util, ashd.serve try: import pdm.srv except: pdm = None def usage(out): - out.write("usage: ashd-wsgi [-hA] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n") + out.write("usage: ashd-wsgi [-hAL] [-m PDM-SPEC] [-p MODPATH] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n") -reqlimit = 0 +hspec = "free", {} modwsgi_compat = False -opts, args = getopt.getopt(sys.argv[1:], "+hAp:l:m:") +setlog = True +opts, args = getopt.getopt(sys.argv[1:], "+hALp:t: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": - 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) if len(args) < 1: usage(sys.stderr) sys.exit(1) +if setlog: + logging.basicConfig(format="ashd-wsgi(%(name)s): %(levelname)s: %(message)s") +log = logging.getLogger("ashd-wsgi") try: handlermod = __import__(args[0], fromlist = ["dummy"]) @@ -46,10 +54,6 @@ else: sys.exit(1) handler = handlermod.application -class closed(IOError): - def __init__(self): - super(closed, self).__init__("The client has closed the connection.") - cwd = os.getcwd() def absolutify(path): if path[0] != '/': @@ -89,7 +93,7 @@ def unquoteurl(url): buf += c return buf -def dowsgi(req): +def mkenv(req): env = {} env["wsgi.version"] = 1, 0 for key, val in req.headers: @@ -121,11 +125,19 @@ def dowsgi(req): env["SCRIPT_NAME"] = name env["PATH_INFO"] = pi if "Host" in req: env["SERVER_NAME"] = req["Host"] + if "X-Ash-Server-Address" in req: env["SERVER_ADDR"] = req["X-Ash-Server-Address"] if "X-Ash-Server-Port" in req: env["SERVER_PORT"] = req["X-Ash-Server-Port"] if "X-Ash-Protocol" in req and req["X-Ash-Protocol"] == "https": env["HTTPS"] = "on" if "X-Ash-Address" in req: env["REMOTE_ADDR"] = req["X-Ash-Address"] - if "Content-Type" in req: env["CONTENT_TYPE"] = req["Content-Type"] - if "Content-Length" in req: env["CONTENT_LENGTH"] = req["Content-Length"] + if "X-Ash-Port" in req: env["REMOTE_PORT"] = req["X-Ash-Port"] + if "Content-Type" in req: + env["CONTENT_TYPE"] = req["Content-Type"] + # The CGI specification does not strictly require this, but + # many actualy programs and libraries seem to. + del env["HTTP_CONTENT_TYPE"] + if "Content-Length" in req: + env["CONTENT_LENGTH"] = req["Content-Length"] + del env["HTTP_CONTENT_LENGTH"] if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"]) if "X-Ash-Protocol" in req: env["wsgi.url_scheme"] = req["X-Ash-Protocol"] env["wsgi.input"] = req.sk @@ -133,104 +145,59 @@ def dowsgi(req): env["wsgi.multithread"] = True env["wsgi.multiprocess"] = False env["wsgi.run_once"] = False + return env + +class request(ashd.serve.wsgirequest): + def __init__(self, bkreq, **kw): + super(request, self).__init__(**kw) + self.bkreq = bkreq.dup() + + def mkenv(self): + return mkenv(self.bkreq) + + def handlewsgi(self, env, startreq): + return handler(env, startreq) + + def fileno(self): + return self.bkreq.bsk.fileno() - resp = [] - respsent = [] - - def flushreq(): - if not respsent: - if not resp: - raise Exception, "Trying to write data before starting response." - status, headers = resp - respsent[:] = [True] - try: - req.sk.write("HTTP/1.1 %s\n" % status) - for nm, val in headers: - req.sk.write("%s: %s\n" % (nm, val)) - req.sk.write("\n") - except IOError: - raise closed() - - def write(data): - if not data: - return - flushreq() + def writehead(self, status, headers): + w = self.buffer.extend + w("HTTP/1.1 %s\n" % status) + for nm, val in headers: + w("%s: %s\n" % (nm, val)) + w("\n") + + def flush(self): try: - req.sk.write(data) - req.sk.flush() + ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT) + self.buffer[:ret] = "" except IOError: - raise closed() - - def startreq(status, headers, exc_info = None): - if resp: - if exc_info: # Interesting, this... - try: - if respsent: - raise exc_info[0], exc_info[1], exc_info[2] - finally: - exc_info = None # CPython GC bug? - else: - raise Exception, "Can only start responding once." - resp[:] = status, headers - return write + raise ashd.serve.closed() + + def close(self): + self.bkreq.close() - reqevent = ashd.perf.request(env) - exc = (None, None, None) - try: - respiter = handler(env, startreq) - 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) - except: - exc = sys.exc_info() - finally: - reqevent.__exit__(*exc) - -flightlock = threading.Condition() -inflight = 0 - -class reqthread(threading.Thread): - def __init__(self, req): - super(reqthread, self).__init__(name = "Request handler") - self.req = req.dup() - - def run(self): - global inflight - try: - flightlock.acquire() - try: - if reqlimit != 0: - start = time.time() - while inflight >= reqlimit: - flightlock.wait(10) - if time.time() - start > 10: - os.abort() - inflight += 1 - finally: - flightlock.release() - try: - dowsgi(self.req) - finally: - flightlock.acquire() - try: - inflight -= 1 - flightlock.notify() - finally: - flightlock.release() - finally: - self.req.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-wsgi: 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-wsgi: %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()