Merge pull request #45 from UseAlloy/master

Allows pretty printing of JSON messages w/ cls kwarg

Author: Zakaria Zajac

src/pythonjsonlogger/jsonlogger.py

@@ -64,6 +64,7 @@ def __init__(self, *args, **kwargs):
         self.json_default = kwargs.pop("json_default", None)
         self.json_encoder = kwargs.pop("json_encoder", None)
         self.json_serializer = kwargs.pop("json_serializer", json.dumps)
+        self.json_indent = kwargs.pop("json_indent", None)
         self.prefix = kwargs.pop("prefix", "")
         #super(JsonFormatter, self).__init__(*args, **kwargs)
         logging.Formatter.__init__(self, *args, **kwargs)
@@ -109,7 +110,8 @@ def jsonify_log_record(self, log_record):
         """Returns a json string of the log record."""
         return self.json_serializer(log_record,
                                     default=self.json_default,
-                                    cls=self.json_encoder)
+                                    cls=self.json_encoder,
+                                    indent=self.json_indent)
 
     def format(self, record):
         """Formats a log record and serializes to json"""