FIX: missing site id lookup causing message bus cross talk in multisite

2015-12-09 07:55:43 +11:00 · 2015-12-09 07:55:43 +11:00 · d8795a5345
parent 2cc95af69b
commit d8795a5345
1 changed files with 9 additions and 3 deletions
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@ -1,5 +1,10 @@
-MessageBus.site_id_lookup do
-  RailsMultisite::ConnectionManagement.current_db
+MessageBus.site_id_lookup do |env=nil|
+  if env
+    setup_message_bus_env(env)
+    env["__mb"][:site_id]
+  else
+    RailsMultisite::ConnectionManagement.current_db
+  end
 end

 def setup_message_bus_env(env)
@ -26,7 +31,8 @@ def setup_message_bus_env(env)
        },
      user_id: user_id,
      group_ids: group_ids,
-      is_admin: is_admin
+      is_admin: is_admin,
+      site_id: RailsMultisite::ConnectionManagement.current_db

    }
    env["__mb"] = hash