X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fashd-wsgi;h=af2c332812fcb0f7fa2dd852965123dce501e424;hp=894211d8a5ab66023bbbefca547982f188c3f2cf;hb=d5ee5cdea79ab756f4a7908c19b8232d57a1a3a8;hpb=2824afabef34b9bd0aa41644c7da1858d1532da8

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index 894211d..af2c332 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -1,14 +1,18 @@
 #!/usr/bin/python
 
 import sys, os, getopt, threading, time
-import ashd.proto, ashd.util
+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 [-hA] [-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:")
+opts, args = getopt.getopt(sys.argv[1:], "+hAp:l:m:")
 for o, a in opts:
     if o == "-h":
         usage(sys.stdout)
@@ -19,6 +23,9 @@ for o, a in opts:
         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)
@@ -167,18 +174,27 @@ def dowsgi(req):
         resp[:] = status, headers
         return write
 
-    respiter = handler(env, startreq)
+    reqevent = ashd.perf.request(env)
+    exc = (None, None, None)
     try:
+        respiter = handler(env, startreq)
         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()
     finally:
-        if hasattr(respiter, "close"):
-            respiter.close()
+        reqevent.__exit__(*exc)
 
 flightlock = threading.Condition()
 inflight = 0