X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python%2Fashd-wsgi;h=2e4a2fe4d64199973cc225be60b5d19e60fdbbb1;hb=1af656d2284a5f51631ae11ee9fa068af5c1ccc4;hp=e43dbc0c04f11f3e6d665cff39ceb2c7ea1c63a0;hpb=3e11d7ede84e52974e41542ed60899ff340088d7;p=ashd.git

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index e43dbc0..2e4a2fe 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -1,27 +1,40 @@
 #!/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):
-    out.write("usage: ashd-wsgi [-hA] [-p MODPATH] [-l REQLIMIT] 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: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)
+    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")
+log = logging.getLogger("ashd-wsgi")
 
 try:
     handlermod = __import__(args[0], fromlist = ["dummy"])
@@ -92,10 +105,6 @@ def dowsgi(req):
     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:
@@ -104,14 +113,33 @@ def dowsgi(req):
     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-Address" in req: env["SERVER_ADDR"] = req["X-Ash-Server-Address"]
     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-Port" in req: env["REMOTE_PORT"] = req["X-Ash-Port"]
+    if "Content-Type" in req:
+        env["CONTENT_TYPE"] = req["Content-Type"]
+        # The CGI specification does not strictly require this, but
+        # many actualy programs and libraries seem to.
+        del env["HTTP_CONTENT_TYPE"]
+    if "Content-Length" in req:
+        env["CONTENT_LENGTH"] = req["Content-Length"]
+        del env["HTTP_CONTENT_LENGTH"]
     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
@@ -160,18 +188,28 @@ def dowsgi(req):
         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)
-            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
+        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
@@ -204,6 +242,8 @@ class reqthread(threading.Thread):
                     flightlock.notify()
                 finally:
                     flightlock.release()
+        except:
+            log.error("exception occurred in handler thread", exc_info=True)
         finally:
             self.req.close()