X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=python%2Fashd-wsgi;h=2e4a2fe4d64199973cc225be60b5d19e60fdbbb1;hb=1af656d2284a5f51631ae11ee9fa068af5c1ccc4;hp=ae08137a1a80fb460dce85d47adbacad526e9e18;hpb=4e7888f79c780b6d79420374f5ab3843d7784fad;p=ashd.git diff --git a/python/ashd-wsgi b/python/ashd-wsgi index ae08137..2e4a2fe 100755 --- a/python/ashd-wsgi +++ b/python/ashd-wsgi @@ -1,24 +1,40 @@ #!/usr/bin/python -import sys, os, getopt, threading -import ashd.proto, ashd.util +import sys, os, getopt, threading, logging, time +import ashd.proto, ashd.util, ashd.perf +try: + import pdm.srv +except: + pdm = None def usage(out): - out.write("usage: ashd-wsgi [-hA] [-p MODPATH] HANDLER-MODULE [ARGS...]\n") + out.write("usage: ashd-wsgi [-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:") +setlog = True +opts, args = getopt.getopt(sys.argv[1:], "+hAp: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) + 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"]) @@ -36,12 +52,49 @@ 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] != '/': return os.path.join(cwd, path) return path +def unquoteurl(url): + buf = "" + i = 0 + while i < len(url): + c = url[i] + i += 1 + if c == '%': + if len(url) >= i + 2: + c = 0 + if '0' <= url[i] <= '9': + c |= (ord(url[i]) - ord('0')) << 4 + elif 'a' <= url[i] <= 'f': + c |= (ord(url[i]) - ord('a') + 10) << 4 + elif 'A' <= url[i] <= 'F': + c |= (ord(url[i]) - ord('A') + 10) << 4 + else: + raise ValueError("Illegal URL escape character") + if '0' <= url[i + 1] <= '9': + c |= ord(url[i + 1]) - ord('0') + elif 'a' <= url[i + 1] <= 'f': + c |= ord(url[i + 1]) - ord('a') + 10 + elif 'A' <= url[i + 1] <= 'F': + c |= ord(url[i + 1]) - ord('A') + 10 + else: + raise ValueError("Illegal URL escape character") + buf += chr(c) + i += 2 + else: + raise ValueError("Incomplete URL escape character") + else: + buf += c + return buf + def dowsgi(req): env = {} env["wsgi.version"] = 1, 0 @@ -52,7 +105,6 @@ def dowsgi(req): env["SERVER_PROTOCOL"] = req.ver env["REQUEST_METHOD"] = req.method env["REQUEST_URI"] = req.url - env["PATH_INFO"] = req.rest name = req.url p = name.find('?') if p >= 0: @@ -61,14 +113,33 @@ def dowsgi(req): else: env["QUERY_STRING"] = "" if name[-len(req.rest):] == req.rest: + # This is the same hack used in call*cgi. name = name[:-len(req.rest)] + try: + pi = unquoteurl(req.rest) + except: + pi = req.rest + if name == '/': + # This seems to be normal CGI behavior, but see callcgi.c for + # details. + pi = "/" + pi + name = "" 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 @@ -86,17 +157,23 @@ def dowsgi(req): raise Exception, "Trying to write data before starting response." status, headers = resp respsent[:] = [True] - 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") + 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() - req.sk.write(data) - req.sk.flush() + try: + req.sk.write(data) + req.sk.flush() + except IOError: + raise closed() def startreq(status, headers, exc_info = None): if resp: @@ -111,15 +188,31 @@ def dowsgi(req): resp[:] = status, headers return write - respiter = handler(env, startreq) + reqevent = ashd.perf.request(env) + exc = (None, None, None) try: - for data in respiter: - write(data) + 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: - flushreq() + reqevent.response(resp) + except: + exc = sys.exc_info() + raise finally: - if hasattr(respiter, "close"): - respiter.close() + reqevent.__exit__(*exc) + +flightlock = threading.Condition() +inflight = 0 class reqthread(threading.Thread): def __init__(self, req): @@ -127,8 +220,30 @@ class reqthread(threading.Thread): self.req = req.dup() def run(self): + global inflight try: - dowsgi(self.req) + 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() + except: + log.error("exception occurred in handler thread", exc_info=True) finally: self.req.close()