Merge pull request #26 from sullivanmatt/cleanup-exc-info

Handle error information in a more logical way

Author: Zakaria Zajac

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name = "python-json-logger",
-    version = "0.1.1",
+    version = "0.1.2",
     url = "http://github.com/madzak/python-json-logger",
     license = "BSD",
     description = "A python library adding a json log formatter",

src/pythonjsonlogger/jsonlogger.py

@@ -6,6 +6,9 @@
 import json
 import re
 import datetime
+import traceback
+
+from inspect import istraceback
 
 #Support order in python 2.7 and 3
 try:
@@ -73,6 +76,11 @@ def _default_json_handler(obj):
                     return obj.isoformat()
                 elif isinstance(obj, datetime.time):
                     return obj.strftime('%H:%M')
+                elif istraceback(obj):
+                    tb = ''.join(traceback.format_tb(obj))
+                    return tb.strip()
+                elif isinstance(obj, Exception):
+                    return "Exception: %s" % str(obj)
                 return str(obj)
             self.json_default = _default_json_handler
         self._required_fields = self.parse()