X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python3%2Fashd-wsgi3;h=8944b5ce1fe9bc2a30aef9427ab36e25b2063596;hb=552a70bf49c3798c301ecc1b8c2d9118aa325beb;hp=636111144c5c15ad3ad87e78a3b9bf932c19f7df;hpb=173e0e9efec5ae690cc157fe238113fcd814895e;p=ashd.git

diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3
index 6361111..8944b5c 100755
--- a/python3/ashd-wsgi3
+++ b/python3/ashd-wsgi3
@@ -1,41 +1,54 @@
 #!/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):
-    out.write("usage: ashd-wsgi [-hA] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n")
+    out.write("usage: ashd-wsgi3 [-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: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)
+    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-wsgi3(%(name)s): %(levelname)s: %(message)s")
+log = logging.getLogger("ashd-wsgi3")
 
 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-wsgi3: handler %s not found: %s\n" % (args[0], exc.args[0]))
     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-wsgi3: handler %s has no `wmain' function\n" % args[0])
         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-wsgi3: handler %s has no `application' object\n" % args[0])
         sys.exit(1)
     handler = handlermod.application
 
@@ -118,10 +131,15 @@ def dowsgi(req):
         name = ""
     env["SCRIPT_NAME"] = name
     env["PATH_INFO"] = pi
-    for src, tgt in [("HTTP_HOST", "SERVER_NAME"), ("HTTP_X_ASH_SERVER_PORT", "SERVER_PORT"),
-                     ("HTTP_X_ASH_ADDRESS", "REMOTE_ADDR"), ("HTTP_CONTENT_TYPE", "CONTENT_TYPE"),
-                     ("HTTP_CONTENT_LENGTH", "CONTENT_LENGTH"), ("HTTP_X_ASH_PROTOCOL", "wsgi.url_scheme")]:
+    for src, tgt in [("HTTP_HOST", "SERVER_NAME"), ("HTTP_X_ASH_PROTOCOL", "wsgi.url_scheme"),
+                     ("HTTP_X_ASH_SERVER_ADDRESS", "SERVER_ADDR"), ("HTTP_X_ASH_SERVER_PORT", "SERVER_PORT"),
+                     ("HTTP_X_ASH_ADDRESS", "REMOTE_ADDR"), ("HTTP_X_ASH_PORT", "REMOTE_PORT"),
+                     ("HTTP_CONTENT_TYPE", "CONTENT_TYPE"), ("HTTP_CONTENT_LENGTH", "CONTENT_LENGTH")]:
         if src in env: env[tgt] = env[src]
+    for key in ["HTTP_CONTENT_TYPE", "HTTP_CONTENT_LENGTH"]:
+        # The CGI specification does not strictly require this, but
+        # many actualy programs and libraries seem to.
+        if key in env: del env[key]
     if "X-Ash-Protocol" in req and req["X-Ash-Protocol"] == b"https": env["HTTPS"] = "on"
     if "X-Ash-File" in req: env["SCRIPT_FILENAME"] = absolutify(req["X-Ash-File"].decode(locale.getpreferredencoding()))
     env["wsgi.input"] = req.sk
@@ -178,18 +196,21 @@ def dowsgi(req):
         resp[:] = status, headers
         return write
 
-    respiter = handler(env, startreq)
-    try:
+    with ashd.perf.request(env) as reqevent:
         try:
-            for data in respiter:
-                write(data)
-            if resp:
-                flushreq()
+            respiter = handler(env, startreq)
+            try:
+                for data in respiter:
+                    write(data)
+                if resp:
+                    flushreq()
+            finally:
+                if hasattr(respiter, "close"):
+                    respiter.close()
         except closed:
             pass
-    finally:
-        if hasattr(respiter, "close"):
-            respiter.close()
+        if resp:
+            reqevent.response(resp)
 
 flightlock = threading.Condition()
 inflight = 0
@@ -216,8 +237,11 @@ class reqthread(threading.Thread):
                 with flightlock:
                     inflight -= 1
                     flightlock.notify()
+        except:
+            log.error("exception occurred in handler thread", exc_info=True)
         finally:
             self.req.close()
+            sys.stderr.flush()
     
 def handle(req):
     reqthread(req).start()