adjust unit test, fixed bug

Author: oschulzSam

logstash_async/constants.py

@@ -27,7 +27,7 @@ class Constants:
     FORMATTER_RECORD_FIELD_SKIP_LIST = [
         'args', 'asctime', 'created', 'exc_info', 'exc_text', 'filename', 'funcName',
         'id', 'levelname', 'levelno', 'lineno', 'message','module',
-        'msecs', 'msg', 'pathname', 'process',
+        'msecs', 'msg', 'name', 'pathname', 'process',
         'processName', 'relativeCreated', 'stack_info', 'thread', 'threadName']
     # fields to be set on the top-level of a Logstash event/message, do not modify this
     # unless you know what you are doing

logstash_async/formatter.py

@@ -100,11 +100,8 @@ def format(self, record):
         message.update(dynamic_extra_fields)
         # prepare static extra fields
         self._format_extra_fields()
-        message.update(self._extra)
-        # remove all fields to be excluded
-
-        # move existing extra record fields into the configured prefix
-        # self._move_extra_record_fields_to_prefix(message)
+        if self._extra:
+            message.update(self._extra)
 
         return self._serialize(message)
 
@@ -128,6 +125,7 @@ def value_repr(value):
             elif isinstance(value, uuid.UUID):
                 return value.hex
             elif isinstance(value, easy_types):
+
                 return value
             else:
                 return repr(value)

tests/formatter_test.py

@@ -23,7 +23,7 @@ def handleError(self, record):
 class LogstashFormatterTest(unittest.TestCase):
     def test_format(self):
         file_handler = ExceptionCatchingFileHandler(os.devnull)
-        file_handler.setFormatter(LogstashFormatter(ensure_ascii=False))
+        file_handler.setFormatter(LogstashFormatter())
         file_handler.emit(makeLogRecord({"msg": u"тест"}))
         file_handler.close()