Merge lp:~cprov/snappy-proposed-image-tester/logging into lp:snappy-proposed-image-tester

[Celso Providelo]

Fix logstash 'solution' name to match the other services as 'snappy-proposed', derive queue name from it.

Fix logstash 'solution' name to match the other services as 'snappy-proposed', derive queue name from it.

[Celso Providelo (cprov)]

Self-approving because I am evil!

review: Approve

=== modified file 'snappy_proposed_image_tester/constants.py'
--- snappy_proposed_image_tester/constants.py	2015-05-28 02:32:54 +0000
+++ snappy_proposed_image_tester/constants.py	2015-05-28 05:37:26 +0000
@@ -21,9 +21,9 @@
 """Constants for this service."""
 RETRY_COUNT = 3
 
-SOLUTION_NAME = "snappy-proposed-migration"
+SOLUTION_NAME = "snappy-proposed"
 
-SERVICE_NAME = "snappy-proposed-image-tester"
+SERVICE_NAME = "image-tester"
 
 HOSTNAME = socket.gethostname()
 
@@ -33,17 +33,14 @@
     'hostname': HOSTNAME,
 }
 
-# Queue names are constant, rather than being defined in the config.
-QUEUE_PREFIX = "snappy-proposed"
-
 # The queue we listen to for new payloads to check:
-INPUT_QUEUE = "{}.tests.v1".format(QUEUE_PREFIX)
+INPUT_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
 
 # The queue we put fatally error'd payloads into:
-DEAD_LETTER_QUEUE = "{}.deadletters.v1".format(QUEUE_PREFIX)
+DEAD_LETTER_QUEUE = "{}.deadletters.v1".format(SOLUTION_NAME)
 
 # The queue we put payloads on to re-run the test:
-TEST_RETRY_QUEUE = "{}.tests.v1".format(QUEUE_PREFIX)
+TEST_RETRY_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
 
 # The queue we put results on:
-DONE_QUEUE = "{}.results.v1".format(QUEUE_PREFIX)
+DONE_QUEUE = "{}.results.v1".format(SOLUTION_NAME)