Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Handle errors when loading chained modules more properly.
[ashd.git]
/
python
/
ashd
/
wsgidir.py
diff --git
a/python/ashd/wsgidir.py
b/python/ashd/wsgidir.py
index
5711ee6
..
6bf00b6
100644
(file)
--- a/
python/ashd/wsgidir.py
+++ b/
python/ashd/wsgidir.py
@@
-33,11
+33,13
@@
argument `.fpy=my.module.foohandler' can be given to pass requests for
functions, you may want to use the getmod() function in this module.
"""
functions, you may want to use the getmod() function in this module.
"""
-import
os, threading, types
+import
sys, os, threading, types, logging, getopt
import wsgiutil
__all__ = ["application", "wmain", "getmod", "cachedmod", "chain"]
import wsgiutil
__all__ = ["application", "wmain", "getmod", "cachedmod", "chain"]
+log = logging.getLogger("wsgidir")
+
class cachedmod(object):
"""Cache entry for modules loaded by getmod()
class cachedmod(object):
"""Cache entry for modules loaded by getmod()
@@
-87,13
+89,13
@@
def getmod(path):
if path in modcache:
entry = modcache[path]
else:
if path in modcache:
entry = modcache[path]
else:
- entry =
cachedmod()
+ entry =
[threading.Lock(), None]
modcache[path] = entry
finally:
cachelock.release()
modcache[path] = entry
finally:
cachelock.release()
- entry
.lock
.acquire()
+ entry
[0]
.acquire()
try:
try:
- if entry
.mod is None or sb.st_mtime > entry
.mtime:
+ if entry
[1] is None or sb.st_mtime > entry[1]
.mtime:
f = open(path, "r")
try:
text = f.read()
f = open(path, "r")
try:
text = f.read()
@@
-103,11
+105,10
@@
def getmod(path):
mod = types.ModuleType(mangle(path))
mod.__file__ = path
exec code in mod.__dict__
mod = types.ModuleType(mangle(path))
mod.__file__ = path
exec code in mod.__dict__
- entry.mod = mod
- entry.mtime = sb.st_mtime
- return entry
+ entry[1] = cachedmod(mod, sb.st_mtime)
+ return entry[1]
finally:
finally:
- entry
.lock
.release()
+ entry
[0]
.release()
class handler(object):
def __init__(self):
class handler(object):
def __init__(self):
@@
-162,12
+163,20
@@
def wmain(*argv):
Returns the `application' function. If any arguments are given,
they are parsed according to the module documentation.
"""
Returns the `application' function. If any arguments are given,
they are parsed according to the module documentation.
"""
- ret = handler()
- for arg in argv:
+ hnd = handler()
+ ret = hnd.handle
+
+ opts, args = getopt.getopt(argv, "V")
+ for o, a in opts:
+ if o == "-V":
+ import wsgiref.validate
+ ret = wsgiref.validate.validator(ret)
+
+ for arg in args:
if arg[0] == '.':
p = arg.index('=')
if arg[0] == '.':
p = arg.index('=')
-
ret
.addext(arg[1:p], arg[p + 1:])
- return ret
.handle
+
hnd
.addext(arg[1:p], arg[p + 1:])
+ return ret
def chain(env, startreq):
"""Chain-loading WSGI handler
def chain(env, startreq):
"""Chain-loading WSGI handler
@@
-185,7
+194,11
@@
def chain(env, startreq):
object.
"""
path = env["SCRIPT_FILENAME"]
object.
"""
path = env["SCRIPT_FILENAME"]
- mod = getmod(path)
+ try:
+ mod = getmod(path)
+ except Exception:
+ log.error("Exception occurred when loading %s" % path, exc_info=sys.exc_info())
+ return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "Could not load WSGI handler.")
entry = None
if mod is not None:
mod.lock.acquire()
entry = None
if mod is not None:
mod.lock.acquire()