Merge tag '0.21.1' into develop

Author: felliott

CHANGELOG

@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.21.1 (2017-07-20)
+===================
+- Fix: Quiet some overly-verbose error logging.
+
 0.21.0 (2017-04-07)
 ===================
 - Feature: Turn on scrolling for the MFR iframe to support wide JASP files.

mfr/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.21.0'
+__version__ = '0.21.1'
 __import__('pkg_resources').declare_namespace(__name__)

mfr/server/handlers/core.py

@@ -193,6 +193,18 @@ def write_error(self, status_code, exc_info):
                 </div>
             ''')
 
+    # avoid dumping duplicate information to application log
+    def log_exception(self, typ, value, tb):
+        if isinstance(value, tornado.web.HTTPError):
+            if value.log_message:
+                format = "%d %s: " + value.log_message
+                args = ([value.status_code, self._request_summary()] +
+                        list(value.args))
+                tornado.web.gen_log.warning(format, *args)
+        else:
+            tornado.web.app_log.error("Uncaught exception %s\n", self._request_summary(),
+                                       exc_info=(typ, value, tb))
+
     def on_finish(self):
         if self.request.method not in self.ALLOWED_METHODS:
             return