Make parameters vhost-specific.

1 files changed, 5 insertions, 3 deletions

diff --git a/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl b/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
index 1f37a74c70..b5f3022328 100644
--- a/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
+++ b/deps/rabbitmq_federation/src/rabbit_federation_upstream.erl
@@ -59,13 +59,14 @@ from_set(SetName, X, UpstName) ->
     rabbit_federation_util:find_upstreams(UpstName, from_set(SetName, X)).
 
 from_set(<<"all">>, X) ->
-    Connections = rabbit_runtime_parameters:list(<<"federation-upstream">>),
+    Connections = rabbit_runtime_parameters:list(
+                    vhost(X), <<"federation-upstream">>),
     Set = [[{<<"upstream">>, pget(key, C)}] || C <- Connections],
     from_set_contents(Set, X);
 
 from_set(SetName, X) ->
     case rabbit_runtime_parameters:value(
-           <<"federation-upstream-set">>, SetName) of
+           vhost(X), <<"federation-upstream-set">>, SetName) of
         not_found -> [];
         Set       -> from_set_contents(Set, X)
     end.
@@ -76,7 +77,8 @@ from_set_contents(Set, X) ->
 
 from_set_element(UpstreamSetElem, X) ->
     Name = bget(upstream, UpstreamSetElem, []),
-    case rabbit_runtime_parameters:value(<<"federation-upstream">>, Name) of
+    case rabbit_runtime_parameters:value(
+           vhost(X), <<"federation-upstream">>, Name) of
         not_found  -> not_found;
         Upstream   -> from_props_connection(UpstreamSetElem, Name, Upstream, X)
     end.