Merge pull request madzak#29 from landreville/master

Add exception information to output when present.

src/pythonjsonlogger/jsonlogger.py

@@ -121,6 +121,11 @@ def format(self, record):
         if "asctime" in self._required_fields:
             record.asctime = self.formatTime(record, self.datefmt)
 
+        # Display formatted exception, but allow overriding it in the
+        # user-supplied dict.
+        if record.exc_info and not message_dict.get('exc_info'):
+            message_dict['exc_info'] = self.formatException(record.exc_info)
+
         try:
             log_record = OrderedDict()
         except NameError:

tests/tests.py

@@ -2,6 +2,7 @@
 import logging
 import json
 import sys
+import traceback
 
 try:
     import xmlrunner
@@ -153,6 +154,22 @@ def process_log_record(self, log_record):
         logJson = json.loads(self.buffer.getvalue())
         self.assertEqual(logJson.get("custom"), "value")
 
+    def testExcInfo(self):
+        fr = jsonlogger.JsonFormatter()
+        self.logHandler.setFormatter(fr)
+        try:
+            raise Exception('test')
+        except Exception:
+
+            self.logger.exception("hello")
+
+            expected_value = traceback.format_exc()
+            # Formatter removes trailing new line
+            if expected_value.endswith('\n'):
+                expected_value = expected_value[:-1]
+
+        logJson = json.loads(self.buffer.getvalue())
+        self.assertEqual(logJson.get("exc_info"), expected_value)
 
 if __name__ == '__main__':
     if len(sys.argv[1:]) > 0: