Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated ChangeLog.
[ashd.git]
/
python
/
ashd-wsgi
diff --git
a/python/ashd-wsgi
b/python/ashd-wsgi
index
042bf3f
..
9eb3d4f
100755
(executable)
--- a/
python/ashd-wsgi
+++ b/
python/ashd-wsgi
@@
-1,24
+1,39
@@
#!/usr/bin/python
#!/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):
def usage(out):
- out.write("usage: ashd-wsgi [-hA
] [-p MODPATH
] HANDLER-MODULE [ARGS...]\n")
+ out.write("usage: ashd-wsgi [-hA
L] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT
] HANDLER-MODULE [ARGS...]\n")
+reqlimit = 0
modwsgi_compat = False
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)
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 == "-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 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"])
try:
handlermod = __import__(args[0], fromlist = ["dummy"])
@@
-89,10
+104,6
@@
def dowsgi(req):
env["SERVER_PROTOCOL"] = req.ver
env["REQUEST_METHOD"] = req.method
env["REQUEST_URI"] = req.url
env["SERVER_PROTOCOL"] = req.ver
env["REQUEST_METHOD"] = req.method
env["REQUEST_URI"] = req.url
- try:
- env["PATH_INFO"] = unquoteurl(req.rest)
- except:
- env["PATH_INFO"] = req.rest
name = req.url
p = name.find('?')
if p >= 0:
name = req.url
p = name.find('?')
if p >= 0:
@@
-101,8
+112,19
@@
def dowsgi(req):
else:
env["QUERY_STRING"] = ""
if name[-len(req.rest):] == req.rest:
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)]
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["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 "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"
@@
-126,10
+148,13
@@
def dowsgi(req):
raise Exception, "Trying to write data before starting response."
status, headers = resp
respsent[:] = [True]
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:
def write(data):
if not data:
@@
-154,15
+179,31
@@
def dowsgi(req):
resp[:] = status, headers
return write
resp[:] = status, headers
return write
- respiter = handler(env, startreq)
+ reqevent = ashd.perf.request(env)
+ exc = (None, None, None)
try:
try:
- for data in respiter:
- write(data)
+ 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:
if resp:
- flushreq()
+ reqevent.response(resp)
+ except:
+ exc = sys.exc_info()
+ raise
finally:
finally:
- if hasattr(respiter, "close"):
- respiter.close()
+ reqevent.__exit__(*exc)
+
+flightlock = threading.Condition()
+inflight = 0
class reqthread(threading.Thread):
def __init__(self, req):
class reqthread(threading.Thread):
def __init__(self, req):
@@
-170,8
+211,28
@@
class reqthread(threading.Thread):
self.req = req.dup()
def run(self):
self.req = req.dup()
def run(self):
+ global inflight
try:
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()
finally:
self.req.close()