Extend HTTPExceptionHandler to deal with any exception.

2cd17f64 · Hanno Schlichting · d69a8576 · 2cd17f64
Commit 2cd17f64 authored Jul 22, 2016 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 1 deletion

src/Zope2/Startup/httpexceptions.py src/Zope2/Startup/httpexceptions.py +33 -1

No files found.
--- a/src/Zope2/Startup/httpexceptions.py
+++ b/src/Zope2/Startup/httpexceptions.py
-from zExceptions import HTTPException
+from zExceptions import (
+    HTTPException,
+    InternalError,
+)
+
+ERROR_HTML = """\
+<html>
+<head><title>Site Error</title></head>
+<body bgcolor="#FFFFFF">
+<h2>Site Error</h2>
+<p>An error was encountered while publishing this resource.
+</p>
+<p><strong>Sorry, a site error occurred.</strong></p>
+
+%s
+<hr noshade="noshade"/>
+
+<p>Troubleshooting Suggestions</p>
+
+<ul>
+<li>The URL may be incorrect.</li>
+<li>The parameters passed to this resource may be incorrect.</li>
+<li>A resource that this resource relies on may be
+  encountering an error.</li>
+</ul>
+
+<p>If the error persists please contact the site maintainer.
+Thank you for your patience.
+</p></body></html>"""


 class HTTPExceptionHandler(object):
@@ -12,6 +40,10 @@ class HTTPExceptionHandler(object):
            return self.application(environ, start_response)
        except HTTPException as exc:
            return exc(environ, start_response)
+        except Exception as exc:
+            wrapper = InternalError()
+            wrapper.setBody(ERROR_HTML % repr(exc))
+            return wrapper(environ, start_response)


 def main(app, global_conf=None):