From c4aa8c527b95e223945837f43ecf818ecaa94ada Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Feb 07 2018 09:47:10 +0000
Subject: Only listen to hubs event from the same environment


Fixes #558

---

diff --git a/fedmsg.d/base.py b/fedmsg.d/base.py
index 57b487a..d97e2e6 100644
--- a/fedmsg.d/base.py
+++ b/fedmsg.d/base.py
@@ -20,7 +20,7 @@
 config = dict(
     # Set this to dev if you're hacking on fedmsg or an app.
     # Set to stg or prod if running in the Fedora Infrastructure
-    environment="prod",
+    environment="dev",
 
     # Default is 0
     high_water_mark=0,
diff --git a/hubs/backend/triage.py b/hubs/backend/triage.py
index 7f47a18..47cbc26 100755
--- a/hubs/backend/triage.py
+++ b/hubs/backend/triage.py
@@ -90,7 +90,10 @@ def triage(msg):
             }))
 
     # Handle Hubs changes
-    if topic.endswith('.hubs.hub.created'):
+    env_topic_prefix = ".".join([
+        fedmsg_config["topic_prefix"], fedmsg_config["environment"]
+        ])
+    if topic == env_topic_prefix + '.hubs.hub.created':
         hub = hubs.models.Hub.query.get(msg["msg"]["hub_id"])
         if hub is not None:
             yield retask.task.Task(json.dumps({
@@ -98,7 +101,7 @@ def triage(msg):
                 'hub': hub.id,
                 'created': True,
             }))
-    if topic.endswith('.hubs.user.created'):
+    if topic == env_topic_prefix + '.hubs.user.created':
         username = msg["msg"]["username"]
         user = hubs.models.User.query.get(username)
         if user is not None:
@@ -107,7 +110,7 @@ def triage(msg):
                 'username': username,
                 'created': True,
             }))
-    if topic.endswith('.hubs.widget.updated'):
+    if topic == env_topic_prefix + '.hubs.widget.updated':
         widget = hubs.models.Widget.query.get(msg["msg"]["widget_id"])
         if widget is not None:
             widget_will_reload = False