From 43627ee55a8bb9e876c8fcda3878326f72c8a5fa Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Mon, 24 Aug 2015 20:05:20 -0400
Subject: Refine REST server and request handler exception handling.

---
 src/mailman/rest/wsgiapp.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mailman/rest/wsgiapp.py b/src/mailman/rest/wsgiapp.py
index 06bd9d2b9..40757ee31 100644
--- a/src/mailman/rest/wsgiapp.py
+++ b/src/mailman/rest/wsgiapp.py
@@ -39,6 +39,7 @@ from wsgiref.simple_server import make_server as wsgi_server
 log = logging.getLogger('mailman.http')
 _missing = object()
 SLASH = '/'
+EMPTYSTRING = ''
 
 
 
@@ -48,7 +49,7 @@ class AdminWSGIServer(WSGIServer):
     def handle_error(self, request, client_address):
         # Interpose base class method so that the exception gets printed to
         # our log file rather than stderr.
-        log.exception('Exception happened during request from %s',
+        log.exception('REST server exception during request from %s',
                       client_address)
 
 
@@ -63,10 +64,14 @@ class AdminWebServiceWSGIRequestHandler(WSGIRequestHandler):
         # Return a fake stderr object that will actually write its output to
         # the log file.
         class StderrLogger:
+            def __init__(self):
+                self._buffer = []
             def write(self, message):
-                log.exception('Client error')
+                self._buffer.append(message)
             def flush(self):
-                pass
+                self._buffer.insert(0, 'REST request handler error:\n')
+                log.error(EMPTYSTRING.join(self._buffer))
+                self._buffer = []
         return StderrLogger()
 
 
-- 
cgit v1.2.3-70-g09d2