Add compatibility with regular (non structured) logging usage

Part of #8.

Author: EvaSDK

fluent/handler.py

@@ -56,7 +56,9 @@ def _structuring(self, data, msg):
             try:
                 self._add_dic(data, json.loads(str(msg)))
             except ValueError:
-                pass
+                self._add_dic(data, {'message': msg})
+        else:
+            self._add_dic(data, {'message': msg})
 
     @staticmethod
     def _add_dic(data, dic):

tests/test_handler.py

@@ -64,3 +64,44 @@ def test_custom_fmt(self):
         self.assertTrue('name' in data[0][2])
         self.assertEqual('fluent.test', data[0][2]['name'])
         self.assertTrue('lineno' in data[0][2])
+
+    def test_unstructured_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('hello world')
+        handler.close()
+
+        data = self.get_data()
+        self.assertTrue('message' in data[0][2])
+        self.assertEqual('hello world', data[0][2]['message'])
+
+    def test_non_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(42)
+        handler.close()
+
+        data = self.get_data()
+        self.assertTrue('message' in data[0][2])
+
+    def test_non_string_dict_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({42: 'root'})
+        handler.close()
+
+        data = self.get_data()
+        # For some reason, non-string keys are ignored
+        self.assertFalse(42 in data[0][2])