#560 Only listen to hubs event from the same environment
Merged 6 years ago by abompard. Opened 6 years ago by abompard.
abompard/fedora-hubs fix/558  into  develop

file modified
+1 -1
@@ -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,

file modified
+6 -3
@@ -90,7 +90,10 @@ 

              }))

  

      # 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 @@ 

                  '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 @@ 

                  '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

Commit 67b31c0 fixes this pull-request

Pull-Request has been merged by abompard

6 years ago

Pull-Request has been merged by abompard

6 years ago