LogglyHandler takes only one URL argument on init

Author: Ethan Ho

src/reactors/logtypes/loggly_futures_session.py

@@ -29,25 +29,10 @@ def response_hook_noop(resp, *args, **kwargs):
 class LogglyHandler(logging.Handler):
     """Send logs to Loggly HTTPS handler"""
 
-    def __init__(self, config):
-        if not isinstance(config, dict):
-            config = {}
+    def __init__(self, url):
         super(LogglyHandler, self).__init__()
-        # assert not hasattr(self, 'config')
-        self.config = config
+        self.url = url
 
-    @property
-    def url(self):
-        """Form Loggly URL. User can supply either a loggly.customer_token, 
-        a loggly.url, or both if they format the loggly.url correctly for 
-        parsing below.
-        """
-        url = self.config.get('url', '')
-        customer_token = self.config.get('customer_token', '')
-        if not url:
-            url = 'https://logs-01.loggly.com/inputs/{customer_token}/tag/python'
-        return url.replace("{customer_token}", customer_token)
-
     def get_full_message(self, record):
         if record.exc_info:
             return '\n'.join(traceback.format_exception(*record.exc_info))

src/reactors/logtypes/main.py

@@ -36,6 +36,8 @@
 # Working directory - home of logs
 PWD = os.getcwd()
 
+DEFAULT_LOGGLY_URL = 'https://logs-01.loggly.com/inputs/{customer_token}/tag/python'
+
 
 def get_log_file_strategy():
     return LOG_FILE_STRATEGY_DEFAULT
@@ -206,27 +208,25 @@ def get_loggly_logger(name,
     '''Returns a logger object that can post to Loggly'''
 
     log_level = settings.get('logs', {}).get('level', LOG_LEVEL)
-    logger = _get_logger(name=name, subname=subname,
-                         log_level=log_level)
-
-    # Create the STDERR logger
-    text_formatter = _get_formatter(name, subname, redactions, timestamp)
-    stderrHandler = logging.StreamHandler()
-    stderrHandler.setFormatter(text_formatter)
-    logger.addHandler(stderrHandler)
-
-    # Create NETWORK logger if log_token present
-    log_token = settings.get('loggly', {}).get('customer_token', None)
-    config = settings.get('loggly', None)
-    if log_token is not None and config is not None:
-        json_formatter = _get_loggly_formatter(name, subname,
-                                                 redactions,
-                                                 fields,
-                                                 timestamp)
+    logger = _get_logger(name=name, subname=subname, log_level=log_level)
 
-        networkHandler = LogglyHandler(config)
-        networkHandler.setFormatter(json_formatter)
-        logger.addHandler(networkHandler)
+    # Construct the Loggly URL
+    config = settings.get('loggly', dict())
+    url = config.get('url', '')
+    customer_token = config.get('customer_token')
+    if customer_token is None:
+        customer_token = str()
+    if not url:
+        url = DEFAULT_LOGGLY_URL
+    url = url.replace('{customer_token}', customer_token)
+
+    # Create LogglyHandler if loggly config is present
+    if config and customer_token:
+        json_formatter = _get_loggly_formatter(name, subname, redactions, fields, 
+                                               timestamp)
+        loggly_handler = LogglyHandler(url=url)
+        loggly_handler.setFormatter(json_formatter)
+        logger.addHandler(loggly_handler)
 
     # TODO: Forward to loggly if token is set
     return logger

tests/test_loggly.py

@@ -25,7 +25,8 @@ def test_loggly_handler(R_tp_opt, loggly_token, monkeypatch):
     assert lh._resp.result().status_code == 200
 
     # now bork the token and check that the response fails to POST
-    lh.config['customer_token'] = 'bogus_token'
+    bogus_token = "bogus_token"
+    lh.url = 'https://logs-01.loggly.com/inputs/{}/tag/python'.format(bogus_token)
     r.loggers.loggly.info('this message from LogglyHandler wont go through')
     assert lh._resp.result().status_code != 200