From 0d9e52fa9d1423271cdadf09867eb5dbd7741796 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mar 01 2018 00:59:44 +0000
Subject: [PATCH 1/2] Allow subscribing to configurable bus topic.


This is for our internal STOMP support.  There, resultsdb messages publish on a different topic.

---

diff --git a/greenwave/consumers/resultsdb.py b/greenwave/consumers/resultsdb.py
index 217b73b..d7b747e 100644
--- a/greenwave/consumers/resultsdb.py
+++ b/greenwave/consumers/resultsdb.py
@@ -48,9 +48,8 @@ class ResultsDBHandler(fedmsg.consumers.FedmsgConsumer):
 
         prefix = hub.config.get('topic_prefix')
         env = hub.config.get('environment')
-        self.topic = [
-            prefix + '.' + env + '.taskotron.result.new',
-        ]
+        suffix = hub.config.get('resultsdb_topic_suffix', 'taskotron.result.new')
+        self.topic = '.'.join([prefix, env, suffix])
         self.fedmsg_config = fedmsg.config.load_config()
 
         super(ResultsDBHandler, self).__init__(hub, *args, **kwargs)
diff --git a/greenwave/consumers/waiverdb.py b/greenwave/consumers/waiverdb.py
index c022554..87fa047 100644
--- a/greenwave/consumers/waiverdb.py
+++ b/greenwave/consumers/waiverdb.py
@@ -43,9 +43,8 @@ class WaiverDBHandler(fedmsg.consumers.FedmsgConsumer):
 
         prefix = hub.config.get('topic_prefix')
         env = hub.config.get('environment')
-        self.topic = [
-            prefix + '.' + env + '.waiver.new',
-        ]
+        suffix = hub.config.get('waiverdb_topic_suffix', 'waiver.new')
+        self.topic = '.'.join([prefix, env, suffix])
         self.fedmsg_config = fedmsg.config.load_config()
 
         super(WaiverDBHandler, self).__init__(hub, *args, **kwargs)

From b5d08bd0b61eacb839da3c801f27fde1fb46743a Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mar 01 2018 01:14:33 +0000
Subject: [PATCH 2/2] Make a note of new config values in the config files.


---

diff --git a/fedmsg.d/resultsdb.py b/fedmsg.d/resultsdb.py
index 6a48d1d..ae08431 100644
--- a/fedmsg.d/resultsdb.py
+++ b/fedmsg.d/resultsdb.py
@@ -1,3 +1,5 @@
 config = dict(
-    resultsdb_handler=True
+    resultsdb_handler=True,
+    # Topic on which greenwave should listen for new resultsdb results.
+    resultsdb_topic_suffix='taskotron.result.new',
 )
diff --git a/fedmsg.d/waiverdb.py b/fedmsg.d/waiverdb.py
index 5d8858d..d4a4e70 100644
--- a/fedmsg.d/waiverdb.py
+++ b/fedmsg.d/waiverdb.py
@@ -1,3 +1,5 @@
 config = dict(
-    waiverdb_handler=True
+    waiverdb_handler=True,
+    # Topic on which greenwave should listen for new waiverdb waivers.
+    waiverdb_topic_suffix='waiver.new',
 )