remove old LogstashFormatterVersion0

Author: Patralos

MANIFEST.in

@@ -2,3 +2,4 @@ include LICENSE
 include README.rst
 include example1.py
 include example2.py
+include example3.py

README.rst

@@ -12,6 +12,9 @@ http://logstash.net/
 
 Changelog
 =========
+0.5.1
+  - New Config for Field / Stacktrace Limit
+  - Removed Version 0 (old scheme)
 0.5.0
   - New HTTP Handler
 0.4.8

logstash/formatter.py

@@ -106,37 +106,8 @@ def serialize(cls, message):
         else:
             return bytes(json.dumps(message), 'utf-8')
 
-class LogstashFormatterVersion0(LogstashFormatterBase):
-    version = 0
 
-    def format(self, record):
-        # Create message dict
-        message = {
-            '@timestamp': self.format_timestamp(record.created),
-            '@message': record.getMessage(),
-            '@source': self.format_source(self.message_type, self.host,
-                                          record.pathname),
-            '@source_host': self.host,
-            '@source_path': record.pathname,
-            '@tags': self.tags,
-            '@type': self.message_type,
-            '@fields': {
-                'levelname': record.levelname,
-                'logger': record.name,
-            },
-        }
-
-        # Add extra fields
-        message['@fields'].update(self.get_extra_fields(record))
-
-        # If exception, add debug info
-        if record.exc_info:
-            message['@fields'].update(self.get_debug_fields(record))
-
-        return self.serialize(message)
-
-
-class LogstashFormatterVersion1(LogstashFormatterBase):
+class LogstashFormatter(LogstashFormatterBase):
 
     def format(self, record):
         # Create message dict

logstash/handler_amqp.py

@@ -33,7 +33,6 @@ class AMQPLogstashHandler(SocketHandler, object):
 
     :param tags: list of tags for a logger (default is None).
     :param message_type: The type of the message (default logstash).
-    :param version: version of logstash event schema (default is 0).
 
     :param extra_fields: Send extra fields on the log record to graylog
         if true (the default)
@@ -46,7 +45,7 @@ class AMQPLogstashHandler(SocketHandler, object):
     def __init__(self, host='localhost', port=5672, username='guest',
                  password='guest', exchange='logstash', exchange_type='fanout',
                  virtual_host='/', message_type='logstash', tags=None,
-                 durable=False, passive=False, version=0, extra_fields=True,
+                 durable=False, passive=False, extra_fields=True,
                  fqdn=False, facility=None, exchange_routing_key=''):
 
 
@@ -66,9 +65,7 @@ def __init__(self, host='localhost', port=5672, username='guest',
 
         # Extract Logstash paramaters
         self.tags = tags or []
-        fn = formatter.LogstashFormatterVersion1 if version == 1 \
-            else formatter.LogstashFormatterVersion0
-        self.formatter = fn(message_type, tags, fqdn)
+        self.formatter = formatter.LogstashFormatter(message_type, tags, fqdn)
 
         # Standard logging parameters
         self.extra_fields = extra_fields

logstash/handler_http.py

@@ -14,19 +14,17 @@ class HTTPLogstashHandler(NullHandler, object):
     :param ssl: Use SSL for logstash server (default False).
     :param message_type: The type of the message (default logstash).
     :param fqdn; Indicates whether to show fully qualified domain name or not (default False).
-    :param version: version of logstash event schema (default is 0).
     :param tags: list of tags for a logger (default is None).
     :param verify: verify ssl (default is True)
     :param username: basic_auth user (default is None)
     :param password: basic_auth user (default is None)
     """
 
-    def __init__(self, host, port=80, ssl=False, message_type='logstash', tags=None, fqdn=False, version=0, verify=True, username=None, password=None):
+    def __init__(self, host, port=80, ssl=False, message_type='logstash', tags=None, fqdn=False, verify=True, username=None, password=None):
         super(NullHandler, self).__init__()
-        if version == 1:
-            self.formatter = formatter.LogstashFormatterVersion1(message_type, tags, fqdn)
-        else:
-            self.formatter = formatter.LogstashFormatterVersion0(message_type, tags, fqdn)
+
+        self.formatter = formatter.LogstashFormatter(message_type, tags, fqdn)
+
         if username and password:
             self.auth = HTTPBasicAuth(username, password)
         else:

logstash/handler_tcp.py

@@ -10,16 +10,13 @@ class TCPLogstashHandler(SocketHandler, object):
     :param port: The port of the logstash server (default 5959).
     :param message_type: The type of the message (default logstash).
     :param fqdn; Indicates whether to show fully qualified domain name or not (default False).
-    :param version: version of logstash event schema (default is 0).
     :param tags: list of tags for a logger (default is None).
     """
 
-    def __init__(self, host, port=5959, message_type='logstash', tags=None, fqdn=False, version=0):
+    def __init__(self, host, port=5959, message_type='logstash', tags=None, fqdn=False):
         super(TCPLogstashHandler, self).__init__(host, port)
-        if version == 1:
-            self.formatter = formatter.LogstashFormatterVersion1(message_type, tags, fqdn)
-        else:
-            self.formatter = formatter.LogstashFormatterVersion0(message_type, tags, fqdn)
+
+        self.formatter = formatter.LogstashFormatter(message_type, tags, fqdn)
 
     def makePickle(self, record):
         return self.formatter.format(record) + b'\n'

logstash/handler_udp.py

@@ -9,7 +9,6 @@ class UDPLogstashHandler(TCPLogstashHandler, DatagramHandler):
     :param port: The port of the logstash server (default 5959).
     :param message_type: The type of the message (default logstash).
     :param fqdn; Indicates whether to show fully qualified domain name or not (default False).
-    :param version: version of logstash event schema (default is 0).
     :param tags: list of tags for a logger (default is None).
     """
 

setup.py

@@ -2,7 +2,7 @@
 setup(
     name='python-logstash-nested',
     packages=['logstash'],
-    version='0.4.9',
+    version='0.5.1',
     description='Python logging handler for Logstash.',
     long_description=open('README.rst').read(),
     license='MIT',