From 5f0c1cd631b9abcca90afe15cf129babba86f7f1 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Mon, 16 Jul 2012 08:11:42 +0200 Subject: [PATCH] python: Added more useful logging to wsgidir. --- python/ashd/wsgidir.py | 10 +++++++++- python3/ashd/wsgidir.py | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/python/ashd/wsgidir.py b/python/ashd/wsgidir.py index 6bf00b6..d406c35 100644 --- a/python/ashd/wsgidir.py +++ b/python/ashd/wsgidir.py @@ -140,19 +140,27 @@ class handler(object): def handle(self, env, startreq): if not "SCRIPT_FILENAME" in env: + log.error("wsgidir called without SCRIPT_FILENAME set") return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") path = env["SCRIPT_FILENAME"] if not os.access(path, os.R_OK): + log.error("%s: not readable" % path) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") if "HTTP_X_ASH_PYTHON_HANDLER" in env: - handler = self.resolve(env["HTTP_X_ASH_PYTHON_HANDLER"]) + try: + handler = self.resolve(env["HTTP_X_ASH_PYTHON_HANDLER"]) + except Exception: + log.error("could not load handler %s" % env["HTTP_X_ASH_PYTHON_HANDLER"], exc_info=sys.exc_info()) + return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") else: base = os.path.basename(path) p = base.rfind('.') if p < 0: + log.error("wsgidir called with neither X-Ash-Python-Handler nor a file extension: %s" % path) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") ext = base[p + 1:] if not ext in self.exts: + log.error("unregistered file extension: %s" % ext) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") handler = self.exts[ext] return handler(env, startreq) diff --git a/python3/ashd/wsgidir.py b/python3/ashd/wsgidir.py index c2efcca..fc7e9ab 100644 --- a/python3/ashd/wsgidir.py +++ b/python3/ashd/wsgidir.py @@ -128,19 +128,27 @@ class handler(object): def handle(self, env, startreq): if not "SCRIPT_FILENAME" in env: + log.error("wsgidir called without SCRIPT_FILENAME set") return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") path = env["SCRIPT_FILENAME"] if not os.access(path, os.R_OK): + log.error("%s: not readable" % path) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") if "HTTP_X_ASH_PYTHON_HANDLER" in env: - handler = self.resolve(env["HTTP_X_ASH_PYTHON_HANDLER"]) + try: + handler = self.resolve(env["HTTP_X_ASH_PYTHON_HANDLER"]) + except Exception: + log.error("could not load handler %s" % env["HTTP_X_ASH_PYTHON_HANDLER"], exc_info=sys.exc_info()) + return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") else: base = os.path.basename(path) p = base.rfind('.') if p < 0: + log.error("wsgidir called with neither X-Ash-Python-Handler nor a file extension: %s" % path) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") ext = base[p + 1:] if not ext in self.exts: + log.error("unregistered file extension: %s" % ext) return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.") handler = self.exts[ext] return handler(env, startreq) -- 2.11.0