Merge pull request #2 from alexander-akhmetov/master

Disabled ensure_ascii in JsonOutput

twiggy_goodies/json.py

@@ -3,7 +3,7 @@
 
 import os
 import calendar
-import anyjson
+import json
 import datetime
 import six
 import socket
@@ -22,7 +22,7 @@ def __init__(self, filename=None, stream=None, source_host=None):
         self.filename = filename
 
         def serialize_msg(msg):
-            return anyjson.serialize(self.format(msg, source_host=source_host))
+            return json.dumps(self.format(msg, source_host=source_host), ensure_ascii=False)
 
         super(JsonOutput, self).__init__(format=serialize_msg, close_atexit=True)
 
@@ -49,7 +49,7 @@ def format(self, msg, source_host=None):
     @staticmethod
     def get_log_entry(msg, timestamp, source_host, fields):
         return {
-            '@message': msg.text,
+            '@message': force_str(msg.text),
             '@timestamp': timestamp.isoformat(),
             '@source_host': source_host,
             '@fields': fields,
@@ -70,4 +70,4 @@ def _close(self):
             os.close(self.fd)
 
     def _write(self, msg):
-        os.write(self.fd, (msg + '\n').encode('utf-8'))
+        os.write(self.fd, force_str(msg + '\n'))

twiggy_goodies/utils.py

@@ -4,9 +4,9 @@
 
 
 def force_str(text, encoding='utf-8'):
-    if six.text_type(text):
+    if isinstance(text, six.binary_type):
         return text
-    return text.decode(encoding)
+    return text.encode(encoding)
 
 
 def get_log_level_str(level):