mirror of
https://github.com/discourse/discourse.git
synced 2025-06-05 23:38:47 +08:00
FIX: missing site id lookup causing message bus cross talk in multisite
This commit is contained in:
@ -1,5 +1,10 @@
|
|||||||
MessageBus.site_id_lookup do
|
MessageBus.site_id_lookup do |env=nil|
|
||||||
RailsMultisite::ConnectionManagement.current_db
|
if env
|
||||||
|
setup_message_bus_env(env)
|
||||||
|
env["__mb"][:site_id]
|
||||||
|
else
|
||||||
|
RailsMultisite::ConnectionManagement.current_db
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def setup_message_bus_env(env)
|
def setup_message_bus_env(env)
|
||||||
@ -26,7 +31,8 @@ def setup_message_bus_env(env)
|
|||||||
},
|
},
|
||||||
user_id: user_id,
|
user_id: user_id,
|
||||||
group_ids: group_ids,
|
group_ids: group_ids,
|
||||||
is_admin: is_admin
|
is_admin: is_admin,
|
||||||
|
site_id: RailsMultisite::ConnectionManagement.current_db
|
||||||
|
|
||||||
}
|
}
|
||||||
env["__mb"] = hash
|
env["__mb"] = hash
|
||||||
|
Reference in New Issue
Block a user