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

[Thomi Richards]

Enable TCP logstash delivery, and add the deployment info dict in messages again.

Enable TCP logstash delivery, and add the deployment info dict in messages again.

[Evan (ev)]

Yup, we discussed this in email and agreed that TCP for just CD is the way to go.

review: Approve

=== modified file 'cd.py'
--- cd.py	2015-09-01 02:29:28 +0000
+++ cd.py	2015-09-01 22:36:18 +0000
@@ -70,7 +70,7 @@
 
     # 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)
+    logger = setup_logger(use_tcp=True)
 
     # Deploy new environment if the stage identifier isn't recorded.
     idenfifier_dir = os.path.expanduser('~/ci-cd-identifiers/')
@@ -123,9 +123,7 @@
         'deployment_name': os.path.dirname(args.stage),
         'deployment_identifier': identifier,
         'mojo_log_path': mojo_log_path,
-        # XXX cprov 20150820: temporarily avoiding serialization/size issues
-        # in Logstash, python-logstash needs to be more robust.
-        #'deployment_info': info,
+        'deployment_info': info,
     }
     announcer = logger.info
     if status == 'FAILED':