From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 14 Jul 2012 20:00:17 +0000 (+0200)
Subject: python: Configure logging in ashd-wsgi{,3}.
X-Git-Tag: 0.11~11
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=14640dcc58cd233916c07e9045b4f7a022b37025

python: Configure logging in ashd-wsgi{,3}.
---

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index ae0fc14..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"])
diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3
index 0e562ec..e6c39a4 100755
--- a/python3/ashd-wsgi3
+++ b/python3/ashd-wsgi3
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import sys, os, getopt, threading, time, locale, collections
+import sys, os, getopt, threading, logging, time, locale, collections
 import ashd.proto, ashd.util, ashd.perf
 try:
     import pdm.srv
@@ -8,17 +8,20 @@ except:
     pdm = None
 
 def usage(out):
-    out.write("usage: ashd-wsgi3 [-hA] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n")
+    out.write("usage: ashd-wsgi3 [-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:m:")
+setlog = True
+opts, args = getopt.getopt(sys.argv[1:], "+hALp: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":
@@ -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-wsgi3(%(name)s): %(levelname)s: %(message)s")
 
 try:
     handlermod = __import__(args[0], fromlist = ["dummy"])