Merge pull request fluent#43 from william-p/merge-user-args

repeatedly · repeatedly · commit 520e36eed29a · 2016-04-14T00:44:55.000+09:00
Use getMessage method of record object for parse unstructured message
diff --git a/fluent/handler.py b/fluent/handler.py
@@ -51,14 +51,14 @@ def format(self, record):
         data = dict([(key, value % record.__dict__)
                      for key, value in self._fmt_dict.items()])
 
-        self._structuring(data, record.msg)
+        self._structuring(data, record)
         return data
 
     def usesTime(self):
         return any([value.find('%(asctime)') >= 0
                     for value in self._fmt_dict.values()])
 
-    def _structuring(self, data, msg):
+    def _structuring(self, data, record):
         """ Melds `msg` into `data`.
 
         :param data: dictionary to be sent to fluent server
@@ -67,12 +67,15 @@ def _structuring(self, data, msg):
           :mod:`logging` framework, a JSON encoded string or a dictionary
           that will be merged into dictionary generated in :meth:`format.
         """
+        msg = record.msg
+
         if isinstance(msg, dict):
             self._add_dic(data, msg)
         elif isinstance(msg, basestring):
             try:
                 self._add_dic(data, json.loads(str(msg)))
             except ValueError:
+                msg = record.getMessage()
                 self._add_dic(data, {'message': msg})
         else:
             self._add_dic(data, {'message': msg})
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -88,7 +88,7 @@ def test_unstructured_message(self):
         log = logging.getLogger('fluent.test')
         handler.setFormatter(fluent.handler.FluentRecordFormatter())
         log.addHandler(handler)
-        log.info('hello world')
+        log.info('hello %s', 'world')
         handler.close()
 
         data = self.get_data()
