Merge pull request #11 from novapost/master

Some contributions

Author: madzak

src/jsonlogger.py

@@ -23,6 +23,7 @@
 
 RESERVED_ATTR_HASH = dict(zip(RESERVED_ATTRS, RESERVED_ATTRS))
 
+
 def merge_record_extra(record, target, reserved=RESERVED_ATTR_HASH):
     """
     Merges extra attributes from LogRecord object into target dictionary
@@ -34,11 +35,12 @@ def merge_record_extra(record, target, reserved=RESERVED_ATTR_HASH):
     for key, value in record.__dict__.items():
         #this allows to have numeric keys
         if (key not in reserved
-            and not (hasattr(key,"startswith") and key.startswith('_'))
-            ):
+            and not (hasattr(key, "startswith")
+                     and key.startswith('_'))):
             target[key] = value
     return target
 
+
 class JsonFormatter(logging.Formatter):
     """
     A custom formatter to format logging records as json strings.
@@ -51,17 +53,24 @@ def __init__(self, *args, **kwargs):
         :param json_default: a function for encoding non-standard objects
             as outlined in http://docs.python.org/2/library/json.html
         :param json_encoder: optional custom encoder
+        :param prefix: an optional string prefix added at the beggining of
+            the formatted string
         """
         self.json_default = kwargs.pop("json_default", None)
         self.json_encoder = kwargs.pop("json_encoder", None)
-        super(JsonFormatter, self).__init__(*args, **kwargs)
+        self.prefix = kwargs.pop("prefix", "")
+        #super(JsonFormatter, self).__init__(*args, **kwargs)
+        logging.Formatter.__init__(self, *args, **kwargs)
         if not self.json_encoder and not self.json_default:
             def _default_json_handler(obj):
                 '''Prints dates in ISO format'''
                 if isinstance(obj, datetime.datetime):
+                    if obj.year < 1900:
+                        # strftime do not work with date < 1900
+                        return obj.isoformat()
                     return obj.strftime(self.datefmt or '%Y-%m-%dT%H:%M')
                 elif isinstance(obj, datetime.date):
-                    return obj.strftime('%Y-%m-%d')
+                    return obj.isoformat()
                 elif isinstance(obj, datetime.time):
                     return obj.strftime('%H:%M')
                 return str(obj)
@@ -98,6 +107,7 @@ def format(self, record):
         log_record.update(extras)
         merge_record_extra(record, log_record, reserved=self._skip_fields)
 
-        return json.dumps(log_record,
-                          default=self.json_default,
-                          cls=self.json_encoder)
+        return "%s%s" % (self.prefix,
+                         json.dumps(log_record,
+                                    default=self.json_default,
+                                    cls=self.json_encoder))

tests/tests.py

@@ -1,4 +1,7 @@
-import unittest, logging, json, sys
+import unittest
+import logging
+import json
+import sys
 
 try:
     import xmlrunner
@@ -15,12 +18,13 @@
 import jsonlogger
 import datetime
 
+
 class TestJsonLogger(unittest.TestCase):
     def setUp(self):
         self.logger = logging.getLogger('logging-test')
         self.logger.setLevel(logging.DEBUG)
         self.buffer = StringIO()
-        
+
         self.logHandler = logging.StreamHandler(self.buffer)
         self.logger.addHandler(self.logHandler)
 
@@ -55,7 +59,7 @@ def testFormatKeys(self):
             'threadName'
         ]
 
-        log_format = lambda x : ['%({0:s})'.format(i) for i in x] 
+        log_format = lambda x: ['%({0:s})'.format(i) for i in x]
         custom_format = ' '.join(log_format(supported_keys))
 
         fr = jsonlogger.JsonFormatter(custom_format)
@@ -69,7 +73,7 @@ def testFormatKeys(self):
         for supported_key in supported_keys:
             if supported_key in log_json:
                 self.assertTrue(True)
-    
+
     def testUnknownFormatKey(self):
         fr = jsonlogger.JsonFormatter('%(unknown_key)s %(message)s')
 
@@ -84,7 +88,7 @@ def testLogADict(self):
         fr = jsonlogger.JsonFormatter()
         self.logHandler.setFormatter(fr)
 
-        msg = {"text":"testing logging", "num": 1, 5: "9",
+        msg = {"text": "testing logging", "num": 1, 5: "9",
                "nested": {"more": "data"}}
         self.logger.info(msg)
         logJson = json.loads(self.buffer.getvalue())
@@ -98,8 +102,8 @@ def testLogExtra(self):
         fr = jsonlogger.JsonFormatter()
         self.logHandler.setFormatter(fr)
 
-        extra = {"text":"testing logging", "num": 1, 5: "9",
-               "nested": {"more": "data"}}
+        extra = {"text": "testing logging", "num": 1, 5: "9",
+                 "nested": {"more": "data"}}
         self.logger.info("hello", extra=extra)
         logJson = json.loads(self.buffer.getvalue())
         self.assertEqual(logJson.get("text"), extra["text"])
@@ -112,27 +116,37 @@ def testJsonDefaultEncoder(self):
         fr = jsonlogger.JsonFormatter()
         self.logHandler.setFormatter(fr)
 
-        msg = {"adate": datetime.datetime(1999, 12, 31, 23, 59)}
+        msg = {"adate": datetime.datetime(1999, 12, 31, 23, 59),
+               "otherdate": datetime.date(1789, 7, 14),
+               "otherdatetime": datetime.datetime(1789, 7, 14, 23, 59),
+               "otherdatetimeagain": datetime.datetime(1900, 1, 1)}
         self.logger.info(msg)
         logJson = json.loads(self.buffer.getvalue())
         self.assertEqual(logJson.get("adate"), "1999-12-31T23:59")
+        self.assertEqual(logJson.get("otherdate"), "1789-07-14")
+        self.assertEqual(logJson.get("otherdatetime"), "1789-07-14T23:59:00")
+        self.assertEqual(logJson.get("otherdatetimeagain"),
+                         "1900-01-01T00:00")
 
     def testJsonCustomDefault(self):
         def custom(o):
             return "very custom"
         fr = jsonlogger.JsonFormatter(json_default=custom)
         self.logHandler.setFormatter(fr)
 
-        msg = {"adate": datetime.datetime(1999, 12, 31, 23, 59), "normal": "value"}
+        msg = {"adate": datetime.datetime(1999, 12, 31, 23, 59),
+               "normal": "value"}
         self.logger.info(msg)
         logJson = json.loads(self.buffer.getvalue())
         self.assertEqual(logJson.get("adate"), "very custom")
         self.assertEqual(logJson.get("normal"), "value")
 
-if __name__=='__main__':
-    if len(sys.argv[1:]) > 0 :
+
+if __name__ == '__main__':
+    if len(sys.argv[1:]) > 0:
         if sys.argv[1] == 'xml':
-            testSuite = unittest.TestLoader().loadTestsFromTestCase(testJsonLogger)
+            testSuite = unittest.TestLoader().loadTestsFromTestCase(
+                testJsonLogger)
             xmlrunner.XMLTestRunner(output='reports').run(testSuite)
     else:
         unittest.main()