From 64a8cd9feaab29ed99cadd9eed943a6fc7709fa4 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 16 Aug 2012 06:30:25 +0200
Subject: [PATCH] python: Improved error handling and logging in ashd-wsgi.

---
 python/ashd-wsgi   | 15 +++++++++------
 python3/ashd-wsgi3 | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

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()
     
diff --git a/python3/ashd-wsgi3 b/python3/ashd-wsgi3
index e6c39a4..cdabec3 100755
--- a/python3/ashd-wsgi3
+++ b/python3/ashd-wsgi3
@@ -34,6 +34,7 @@ if len(args) < 1:
     sys.exit(1)
 if setlog:
     logging.basicConfig(format="ashd-wsgi3(%(name)s): %(levelname)s: %(message)s")
+log = logging.getLogger("ashd-wsgi3")
 
 try:
     handlermod = __import__(args[0], fromlist = ["dummy"])
@@ -191,18 +192,18 @@ def dowsgi(req):
         return write
 
     with ashd.perf.request(env) as reqevent:
-        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)
 
@@ -231,6 +232,8 @@ class reqthread(threading.Thread):
                 with flightlock:
                     inflight -= 1
                     flightlock.notify()
+        except:
+            log.error("exception occurred in handler thread", exc_info=True)
         finally:
             self.req.close()
             sys.stderr.flush()
-- 
2.11.0