X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=python%2Fashd-wsgi;h=5e1db095281e98dd628f9689592d92e9f7cf8bd9;hp=9eb3d4f0c5ddf4770f47065a8fe0736be751e5dd;hb=64a8cd9feaab29ed99cadd9eed943a6fc7709fa4;hpb=0281ef697c76ab09635075cf7162eea66bdb1372

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index 9eb3d4f..5e1db09 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -34,6 +34,7 @@ if len(args) < 1:
     sys.exit(1)
 if setlog:
     logging.basicConfig(format="ashd-wsgi(%(name)s): %(levelname)s: %(message)s")
+log = logging.getLogger("ashd-wsgi")
 
 try:
     handlermod = __import__(args[0], fromlist = ["dummy"])
@@ -182,18 +183,18 @@ def dowsgi(req):
     reqevent = ashd.perf.request(env)
     exc = (None, None, None)
     try:
-        respiter = handler(env, startreq)
         try:
+            respiter = handler(env, startreq)
             try:
                 for data in respiter:
                     write(data)
                 if resp:
                     flushreq()
-            except closed:
-                pass
-        finally:
-            if hasattr(respiter, "close"):
-                respiter.close()
+            finally:
+                if hasattr(respiter, "close"):
+                    respiter.close()
+        except closed:
+            pass
         if resp:
             reqevent.response(resp)
     except:
@@ -233,6 +234,8 @@ class reqthread(threading.Thread):
                     flightlock.notify()
                 finally:
                     flightlock.release()
+        except:
+            log.error("exception occurred in handler thread", exc_info=True)
         finally:
             self.req.close()