#!/usr/bin/python
-import sys, os, getopt, threading
-import ashd.proto
+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")
try:
handlermod = __import__(args[0], fromlist = ["dummy"])
if not hasattr(handlermod, "wmain"):
sys.stderr.write("ashd-wsgi: handler %s has no `wmain' function\n" % args[0])
sys.exit(1)
- handler = handlermod.wmain(args[1:])
+ handler = handlermod.wmain(*args[1:])
else:
if not hasattr(handlermod, "application"):
sys.stderr.write("ashd-wsgi: handler %s has no `application' object\n" % args[0])
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
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:
- name = name[:p]
env["QUERY_STRING"] = name[p + 1:]
+ name = name[:p]
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-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-File" in req: env["SCRIPT_FILENAME"] = req["X-Ash-File"]
+ 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
env["wsgi.errors"] = sys.stderr
resp = []
respsent = []
- def write(data):
- if not data:
- return
+ def flushreq():
if not respsent:
if not resp:
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")
- req.sk.write(data)
- req.sk.flush()
+ 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()
+ try:
+ req.sk.write(data)
+ req.sk.flush()
+ except IOError:
+ raise closed()
def startreq(status, headers, exc_info = None):
if resp:
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)
- write("")
+ 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()
+ raise
finally:
- if hasattr(respiter, "close"):
- respiter.close()
+ reqevent.__exit__(*exc)
+
+flightlock = threading.Condition()
+inflight = 0
class reqthread(threading.Thread):
def __init__(self, req):
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()
finally:
self.req.close()
def handle(req):
reqthread(req).start()
-ashd.proto.serveloop(handle)
+ashd.util.serveloop(handle)
Dolda2000 GitWeb / ashd.git / blobdiff