Merge branch 'master' into python2.6-test-fix-and-travis-ci

Author: Zakaria Zajac

.travis.yml

@@ -8,4 +8,3 @@ python:
   - "3.4"
 install: pip install tox-travis
 script: tox
-

README.markdown

@@ -61,6 +61,37 @@ For custom handling of object serialization you can specify default json object
     logger.info("classic message", extra={"special": "value", "run": 12})
 ```
 
+With a Config File
+------------------
+To use the module with a config file using the [`fileConfig` function](https://docs.python.org/3/library/logging.config.html#logging.config.fileConfig), use the class `pythonjsonlogger.jsonlogger.JsonFormatter`. Here is a sample config file.
+
+    [loggers]
+    keys = root,custom
+    
+    [logger_root]
+    handlers = 
+    
+    [logger_custom]
+    level = INFO
+    handlers = custom
+    qualname = custom
+    
+    [handlers]
+    keys = custom
+    
+    [handler_custom]
+    class = StreamHandler
+    level = INFO
+    formatter = json
+    args = (sys.stdout,)
+    
+    [formatters]
+    keys = json
+    
+    [formatter_json]
+    format = %(message)s
+    class = pythonjsonlogger.jsonlogger.JsonFormatter
+
 Example
 =======
 

src/pythonjsonlogger/jsonlogger.py

@@ -124,6 +124,8 @@ def format(self, record):
         # user-supplied dict.
         if record.exc_info and not message_dict.get('exc_info'):
             message_dict['exc_info'] = self.formatException(record.exc_info)
+        if not message_dict.get('exc_info') and record.exc_text:
+            message_dict['exc_info'] = record.exc_text
 
         try:
             log_record = OrderedDict()