Rename null_formatter to raw_formatter in BaseTransport class

josegonzalez · josegonzalez · commit 4c4277fec2f5 · 2013-04-23T18:36:49.000+03:00
diff --git a/beaver/config.py b/beaver/config.py
@@ -266,6 +266,9 @@ def _main_parser(config):
                 if config[key] is not None:
                     config[key] = float(config[key])
 
+            if config.get('format') == 'null':
+                config['format'] = 'raw'
+
             if config['files'] is not None and type(config['files']) == str:
                 config['files'] = config['files'].split(',')
 
@@ -332,6 +335,9 @@ def _section_parser(config, raise_exceptions=True):
             except TypeError:
                 config['tags'] = []
 
+            if config.get('format') == 'null':
+                config['format'] = 'raw'
+
             file_type = config.get('type', None)
             if not file_type:
                 config['type'] = 'file'
diff --git a/beaver/transports/base_transport.py b/beaver/transports/base_transport.py
@@ -32,7 +32,7 @@ def __init__(self, beaver_config, logger=None):
         self._is_valid = True
         self._logger = logger
 
-        def null_formatter(data):
+        def raw_formatter(data):
             return data['@message']
 
         def rawjson_formatter(data):
@@ -53,7 +53,7 @@ def string_formatter(data):
 
         self._formatters['json'] = json.dumps
         self._formatters['msgpack'] = msgpack.packb
-        self._formatters['null'] = null_formatter
+        self._formatters['raw'] = raw_formatter
         self._formatters['rawjson'] = rawjson_formatter
         self._formatters['string'] = string_formatter
 
