X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python3%2Fscgi-wsgi3;h=4242d10fbadb46a241ebd2102ca7059837975ef4;hb=78c8462c86c6043c7326bee7ebdf754e01d641c9;hp=9befb255c6a5a2d2b5353f4753007fd0d94f2e72;hpb=173e0e9efec5ae690cc157fe238113fcd814895e;p=ashd.git

diff --git a/python3/scgi-wsgi3 b/python3/scgi-wsgi3
index 9befb25..4242d10 100755
--- a/python3/scgi-wsgi3
+++ b/python3/scgi-wsgi3
@@ -1,23 +1,27 @@
 #!/usr/bin/python3
 
-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-wsgi3 [-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 = "localhost"
@@ -32,6 +36,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")
 
 if sk is None:
     # This is suboptimal, since the socket on stdin is not necessarily
@@ -42,16 +48,16 @@ if sk is None:
 try:
     handlermod = __import__(args[0], fromlist = ["dummy"])
 except ImportError as exc:
-    sys.stderr.write("scgi-wsgi: handler %s not found: %s\n" % (args[0], exc.args[0]))
+    sys.stderr.write("scgi-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("scgi-wsgi: handler %s has no `wmain' function\n" % args[0])
+        sys.stderr.write("scgi-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("scgi-wsgi: handler %s has no `application' object\n" % args[0])
+        sys.stderr.write("scgi-wsgi3: handler %s has no `application' object\n" % args[0])
         sys.exit(1)
     handler = handlermod.application