Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Handle errors when loading chained modules more properly.
[ashd.git]
/
python
/
ashd-wsgi
diff --git
a/python/ashd-wsgi
b/python/ashd-wsgi
index
894211d
..
9eb3d4f
100755
(executable)
--- a/
python/ashd-wsgi
+++ b/
python/ashd-wsgi
@@
-1,27
+1,39
@@
#!/usr/bin/python
#!/usr/bin/python
-import sys, os, getopt, threading, time
-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] [-l REQLIMIT] 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
reqlimit = 0
modwsgi_compat = False
-opts, args = getopt.getopt(sys.argv[1:], "+hAp:l:")
+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 == "-l":
reqlimit = int(a)
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"])
@@
-167,18
+179,28
@@
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:
+ respiter = handler(env, startreq)
try:
try:
- for data in respiter:
- write(data)
- if resp:
- flushreq()
- except closed:
- pass
+ 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:
finally:
- if hasattr(respiter, "close"):
- respiter.close()
+ reqevent.__exit__(*exc)
flightlock = threading.Condition()
inflight = 0
flightlock = threading.Condition()
inflight = 0