From d8795a5345e66db25048f625e964562426ae6eb8 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 9 Dec 2015 07:55:43 +1100 Subject: [PATCH] FIX: missing site id lookup causing message bus cross talk in multisite --- config/initializers/004-message_bus.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb index 2faee3473..940ae75a1 100644 --- 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