Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Fixed formatting error.
[ashd.git]
/
python
/
ashd-wsgi
diff --git
a/python/ashd-wsgi
b/python/ashd-wsgi
index
ae0fc14
..
9eb3d4f
100755
(executable)
--- a/
python/ashd-wsgi
+++ b/
python/ashd-wsgi
@@
-1,6
+1,6
@@
#!/usr/bin/python
#!/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
import ashd.proto, ashd.util, ashd.perf
try:
import pdm.srv
@@
-8,10
+8,11
@@
except:
pdm = None
def usage(out):
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 [-hA
L
] [-m PDM-SPEC] [-p MODPATH] [-l REQLIMIT] HANDLER-MODULE [ARGS...]\n")
reqlimit = 0
modwsgi_compat = False
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":
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)
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":
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 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"])
try:
handlermod = __import__(args[0], fromlist = ["dummy"])