Merge lp:~thomir-deactivatedaccount/tanuki-continuous-deployer/trunk-use-tcp-logstash into lp:tanuki-continuous-deployer

[Thomi Richards]

Use the TCP logstash logging handler.

Use the TCP logstash logging handler.

[Celso Providelo (cprov)]

Thomi,

Thanks for preparing the terrain for TCP transport.

I want to continue to use log.py to test UDP transport, as our services. Can you add a option to setup_logging() ?

review: Needs Information

[lp:~thomir-deactivatedaccount/tanuki-continuous-deployer/trunk-use-tcp-logstash]

17. By Thomi Richards on 2015-09-01

Add support for TCP/IP-based logging to log.py.

[Celso Providelo (cprov)]

review: Approve

=== modified file 'cd.py'
--- cd.py	2015-08-27 21:27:50 +0000
+++ cd.py	2015-09-01 02:29:45 +0000
@@ -19,7 +19,6 @@
 """CI Automation: mojo spec (branch & stage) watcher."""
 
 import argparse
-import logging
 import os
 import os.path
 import sys
@@ -69,7 +68,9 @@
         '--stage', args.stage
     ])
 
-    logger = setup_logger()
+    # Thomi - 2015-09-01: set this to True (and delete this comment) once we
+    # know that TCP/IP based logstash works well.
+    logger = setup_logger(use_tcp=False)
 
     # Deploy new environment if the stage identifier isn't recorded.
     idenfifier_dir = os.path.expanduser('~/ci-cd-identifiers/')

=== modified file 'ci_automation/utils.py'
--- ci_automation/utils.py	2015-08-14 19:06:02 +0000
+++ ci_automation/utils.py	2015-09-01 02:29:45 +0000
@@ -65,7 +65,7 @@
         )
 
 
-def setup_logger():
+def setup_logger(use_tcp=False):
     """Return a configured logger instance.
 
     Defaults to INFO level and if 'CI_LOGSTASH_HOST' environment variable
@@ -85,9 +85,15 @@
         except ImportError:
             print('Follow the README instructions for installing '
                   'python-logstash')
-            return 1
+            return logger
         else:
-            logger.addHandler(
-                logstash.LogstashHandler(logstash_host, 5959, version=1))
+            if use_tcp:
+                logger.addHandler(
+                    logstash.TCPLogstashHandler(logstash_host, 5959, version=1)
+                )
+            else:
+                logger.addHandler(
+                    logstash.LogstashHandler(logstash_host, 5959, version=1)
+                )
 
     return logger

=== modified file 'log.py'
--- log.py	2015-08-20 16:35:17 +0000
+++ log.py	2015-09-01 02:29:45 +0000
@@ -18,22 +18,19 @@
 """CI Automation: tool for monitoring rabbitmq queue information."""
 
 import argparse
-import json
-import os
-import subprocess
 
 from ci_automation.utils import setup_logger
 
 
-
 def main():
     parser = argparse.ArgumentParser(
         description="Log messages to logstash ...")
     parser.add_argument('--error', action="store_true", default=False)
+    parser.add_argument('--tcp', action="store_true", default=False)
     parser.add_argument('text', metavar="TEXT", help="text to log")
 
     args = parser.parse_args()
-    logger = setup_logger()
+    logger = setup_logger(use_tcp=args.tcp)
 
     extra = {
         'solution': 'spi',