X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python%2Fscgi-wsgi;h=e2689d4bf49eed9df43f4cd489a230fa57126f5e;hb=fa88545551d709cdff26b5421bd69ac6b1af7e3b;hp=42585669286e38cb0e821806be664110a342f5e0;hpb=e4769c6513acfd11318f82bd8f6592c5752338b6;p=ashd.git

diff --git a/python/scgi-wsgi b/python/scgi-wsgi
index 4258566..e2689d4 100755
--- a/python/scgi-wsgi
+++ b/python/scgi-wsgi
@@ -1,26 +1,30 @@
 #!/usr/bin/python
 
-import sys, os, getopt
+import sys, os, getopt, logging
 import socket
 import ashd.scgi
 
 def usage(out):
-    out.write("usage: scgi-wsgi [-hA] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
+    out.write("usage: scgi-wsgi [-hAL] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
 
 sk = None
 modwsgi_compat = False
-opts, args = getopt.getopt(sys.argv[1:], "+hAp:T:")
+setlog = True
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:")
 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 == "-T":
         sk = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sk.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         p = a.rfind(":")
         if p < 0:
-            bindhost = "hostname"
+            bindhost = "localhost"
             bindport = int(a)
         else:
             bindhost = a[:p]
@@ -32,6 +36,8 @@ for o, a in opts:
 if len(args) < 1:
     usage(sys.stderr)
     sys.exit(1)
+if setlog:
+    logging.basicConfig(format="scgi-wsgi(%(name)s): %(levelname)s: %(message)s")
 
 if sk is None:
     # This is suboptimal, since the socket on stdin is not necessarily
@@ -48,7 +54,7 @@ if not modwsgi_compat:
     if not hasattr(handlermod, "wmain"):
         sys.stderr.write("scgi-wsgi: handler %s has no `wmain' function\n" % args[0])
         sys.exit(1)
-    handler = handlermod.wmain(args[1:])
+    handler = handlermod.wmain(*args[1:])
 else:
     if not hasattr(handlermod, "application"):
         sys.stderr.write("scgi-wsgi: handler %s has no `application' object\n" % args[0])