Merge pull request #6 from liampauling/master

spelling errors / py3 compatibility on tests

Author: cmanaha

cmreshandler/cmreshandler.py

@@ -30,7 +30,7 @@ class AuthType(Enum):
         BASIC_AUTH = 1
         KERBEROS_AUTH = 2
 
-    # Defauls for the class
+    # Defaults for the class
     __DEFAULT_HOST = [{'host': 'localhost', 'port': 9200}]
     __DEFAULT_AUTH_USER = ''
     __DEFAULT_AUTH_PASSWD = ''
@@ -97,8 +97,8 @@ def __init__(self,
         self.flush_frequency_in_sec = flush_frequency_in_sec
         self.es_index_name = es_index_name
         self.es_doc_type = es_doc_type
-        self.es_additional_fileds = es_additional_fields.copy()
-        self.es_additional_fileds.update({'host': socket.gethostname(),
+        self.es_additional_fields = es_additional_fields.copy()
+        self.es_additional_fields.update({'host': socket.gethostname(),
                                           'host_ip': socket.gethostbyname(socket.gethostname())})
         self.raise_on_indexing_exceptions = raise_on_indexing_exceptions
 
@@ -199,7 +199,7 @@ def emit(self, record):
         :param record: A class of type ```logging.LogRecord```
         :return: None
         """
-        rec = self.es_additional_fileds.copy()
+        rec = self.es_additional_fields.copy()
         for k, v in record.__dict__.items():
             if k not in CMRESHandler.__LOGGING_FILTER_FIELDS:
                 rec[k] = "" if v is None else v

tests/test_cmreshandler.py

@@ -102,7 +102,7 @@ def test_fast_insertion_of_thousands_logs(self):
         log = logging.getLogger("PythonTest")
         log.setLevel(logging.DEBUG)
         log.addHandler(handler)
-        for i in xrange(1000):
+        for i in range(1000):
             log.info("Logging line {0:d}".format(i), extra={'LineNum': i})
         time.sleep(0.5)
         self.assertEquals(0, len(handler._buffer))