X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python%2Fashd%2Fwsgidir.py;h=5ce7638f11b3e029839f7ebcb80c6cd081c87c9c;hb=48a91dd9f3bce22911839aa678ebe9a6bafab5fc;hp=212c4b73ef4ca20a2bd1e486e42ac2b5851da4d7;hpb=36ea06a63bb12fed3406b3e7bbbcd87633877045;p=ashd.git

diff --git a/python/ashd/wsgidir.py b/python/ashd/wsgidir.py
index 212c4b7..5ce7638 100644
--- a/python/ashd/wsgidir.py
+++ b/python/ashd/wsgidir.py
@@ -1,6 +1,12 @@
 import os, threading, types
 import wsgiutil
 
+class cachedmod:
+    def __init__(self, mod, mtime):
+        self.lock = threading.Lock()
+        self.mod = mod
+        self.mtime = mtime
+
 exts = {}
 modcache = {}
 cachelock = threading.Lock()
@@ -19,9 +25,10 @@ def getmod(path):
     cachelock.acquire()
     try:
         if path in modcache:
-            mod, mtime = modcache[path]
-            if sb.st_mtime <= mtime:
-                return mod
+            entry = modcache[path]
+            if sb.st_mtime <= entry.mtime:
+                return entry
+        
         f = open(path)
         try:
             text = f.read()
@@ -31,20 +38,40 @@ def getmod(path):
         mod = types.ModuleType(mangle(path))
         mod.__file__ = path
         exec code in mod.__dict__
-        modcache[path] = mod, sb.st_mtime
-        return mod
+        entry = cachedmod(mod, sb.st_mtime)
+        modcache[path] = entry
+        return entry
     finally:
         cachelock.release()
 
 def chain(path, env, startreq):
     mod = getmod(path)
-    if hasattr(mod, "wmain"):
-        return (mod.wmain())(env, startreq)
-    elif hasattr(mod, "application"):
-        return mod.application(env, startreq)
+    entry = None
+    if mod is not None:
+        mod.lock.acquire()
+        try:
+            if hasattr(mod, "entry"):
+                entry = mod.entry
+            else:
+                if hasattr(mod.mod, "wmain"):
+                    entry = mod.mod.wmain()
+                elif hasattr(mod.mod, "application"):
+                    entry = mod.mod.application
+                mod.entry = entry
+        finally:
+            mod.lock.release()
+    if entry is not None:
+        return entry(env, startreq)
     return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "Invalid WSGI handler.")
 exts["wsgi"] = chain
 
+def addext(ext, handler):
+    p = handler.rindex('.')
+    mname = handler[:p]
+    hname = handler[p + 1:]
+    mod = __import__(mname, fromlist = ["dummy"])
+    exts[ext] = getattr(mod, hname)
+
 def application(env, startreq):
     if not "SCRIPT_FILENAME" in env:
         return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
@@ -58,5 +85,9 @@ def application(env, startreq):
         return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
     return(exts[ext](path, env, startreq))
 
-def wmain(argv):
+def wmain(*argv):
+    for arg in argv:
+        if arg[0] == '.':
+            p = arg.index('=')
+            addext(arg[1:p], arg[p + 1:])
     return application