Merge pull request fluent#74 from fluent/fix-number-only-string-handling

repeatedly · web-flow · commit 04e8141e47dd · 2017-01-24T15:35:33.000+09:00
Fix raising exception when passing number only string. fix fluent#70
diff --git a/fluent/handler.py b/fluent/handler.py
@@ -88,7 +88,11 @@ def _structuring(self, data, record):
             self._add_dic(data, msg)
         elif isinstance(msg, basestring):
             try:
-                self._add_dic(data, json.loads(str(msg)))
+                json_msg = json.loads(str(msg))
+                if isinstance(json_msg, dict):
+                    self._add_dic(data, json_msg)
+                else:
+                    self._add_dic(data, {'message': str(json_msg)})
             except ValueError:
                 msg = record.getMessage()
                 self._add_dic(data, {'message': msg})
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -146,6 +146,19 @@ def test_unstructured_formatted_message(self):
         self.assertTrue('message' in data[0][2])
         self.assertEqual('hello world, you!', data[0][2]['message'])
 
+    def test_number_string_simple_message(self):
+        handler = fluent.handler.FluentHandler('app.follow', port=self._port)
+
+        logging.basicConfig(level=logging.INFO)
+        log = logging.getLogger('fluent.test')
+        handler.setFormatter(fluent.handler.FluentRecordFormatter())
+        log.addHandler(handler)
+        log.info("1")
+        handler.close()
+
+        data = self.get_data()
+        self.assertTrue('message' in data[0][2])
+
     def test_non_string_simple_message(self):
         handler = fluent.handler.FluentHandler('app.follow', port=self._port)
 
