summaryrefslogtreecommitdiff
path: root/paste
diff options
context:
space:
mode:
Diffstat (limited to 'paste')
-rw-r--r--paste/errormiddleware.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/paste/errormiddleware.py b/paste/errormiddleware.py
index 95ef30f..cf8936b 100644
--- a/paste/errormiddleware.py
+++ b/paste/errormiddleware.py
@@ -208,8 +208,9 @@ def handle_exception(exc_info, conf, error_stream, html=True):
extra_data = ''
reported = True
else:
+ error_message = conf.get('error_message')
return_error = error_template(
- '''
+ error_message or '''
An error occurred. See the error logs for more information.
(Turn debug on to display exception reports here)
''', '')