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

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index af2c332..9eb3d4f 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import sys, os, getopt, threading, time
+import sys, os, getopt, threading, logging, time
 import ashd.proto, ashd.util, ashd.perf
 try:
     import pdm.srv
@@ -8,10 +8,11 @@ except:
     pdm = None
 
 def usage(out):
-    out.write("usage: ashd-wsgi [-hA] [-m PDM-SPEC] [-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
+setlog = True
 opts, args = getopt.getopt(sys.argv[1:], "+hAp:l:m:")
 for o, a in opts:
     if o == "-h":
@@ -19,6 +20,8 @@ for o, a in opts:
         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":
@@ -29,6 +32,8 @@ for o, a in opts:
 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"])
@@ -193,6 +198,7 @@ def dowsgi(req):
             reqevent.response(resp)
     except:
         exc = sys.exc_info()
+        raise
     finally:
         reqevent.__exit__(*exc)