Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Added HTTP date formatting functions to ashd.wsgiutil.
[ashd.git]
/
python3
/
ashd-wsgi3
diff --git
a/python3/ashd-wsgi3
b/python3/ashd-wsgi3
index
6361111
..
e6c39a4
100755
(executable)
--- a/
python3/ashd-wsgi3
+++ b/
python3/ashd-wsgi3
@@
-1,41
+1,53
@@
#!/usr/bin/python3
#!/usr/bin/python3
-import sys, os, getopt, threading, time, locale, collections
-import ashd.proto, ashd.util
+import sys, os, getopt, threading, logging, time, locale, collections
+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
3 [-hAL] [-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:], "+hALp: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-wsgi3(%(name)s): %(levelname)s: %(message)s")
try:
handlermod = __import__(args[0], fromlist = ["dummy"])
except ImportError as exc:
try:
handlermod = __import__(args[0], fromlist = ["dummy"])
except ImportError as exc:
- sys.stderr.write("ashd-wsgi: handler %s not found: %s\n" % (args[0], exc.args[0]))
+ sys.stderr.write("ashd-wsgi
3
: handler %s not found: %s\n" % (args[0], exc.args[0]))
sys.exit(1)
if not modwsgi_compat:
if not hasattr(handlermod, "wmain"):
sys.exit(1)
if not modwsgi_compat:
if not hasattr(handlermod, "wmain"):
- sys.stderr.write("ashd-wsgi: handler %s has no `wmain' function\n" % args[0])
+ sys.stderr.write("ashd-wsgi
3
: handler %s has no `wmain' function\n" % args[0])
sys.exit(1)
handler = handlermod.wmain(*args[1:])
else:
if not hasattr(handlermod, "application"):
sys.exit(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.stderr.write("ashd-wsgi
3
: handler %s has no `application' object\n" % args[0])
sys.exit(1)
handler = handlermod.application
sys.exit(1)
handler = handlermod.application
@@
-178,18
+190,21
@@
def dowsgi(req):
resp[:] = status, headers
return write
resp[:] = status, headers
return write
- respiter = handler(env, startreq)
- try:
+ with ashd.perf.request(env) as reqevent:
+ 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()
+ 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)
flightlock = threading.Condition()
inflight = 0
flightlock = threading.Condition()
inflight = 0
@@
-218,6
+233,7
@@
class reqthread(threading.Thread):
flightlock.notify()
finally:
self.req.close()
flightlock.notify()
finally:
self.req.close()
+ sys.stderr.flush()
def handle(req):
reqthread(req).start()
def handle(req):
reqthread(req).start()