diff options
| -rw-r--r-- | deps/rabbitmq_federation/src/rabbit_federation_app.erl | 7 | ||||
| -rw-r--r-- | deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/deps/rabbitmq_federation/src/rabbit_federation_app.erl b/deps/rabbitmq_federation/src/rabbit_federation_app.erl index b205ee4185..c3cfc28f04 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_app.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_app.erl @@ -10,7 +10,7 @@ -include("rabbit_federation.hrl"). -behaviour(application). --export([start/2, stop/1, start_federation_links/0]). +-export([start/2, stop/1]). %% Dummy supervisor - see Ulf Wiger's comment at %% http://erlang.2086793.n4.nabble.com/initializing-library-applications-without-processes-td2094473.html @@ -29,17 +29,12 @@ -export([init/1]). start(_Type, _StartArgs) -> - _ = timer:apply_after(500, ?MODULE, start_federation_links, []), supervisor:start_link({local, ?MODULE}, ?MODULE, []). stop(_State) -> rabbit_federation_pg:stop_scope(), ok. -start_federation_links() -> - rabbit_federation_exchange_link:go(), - rabbit_federation_queue_link:go(). - %%---------------------------------------------------------------------------- init([]) -> diff --git a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl index d723d86aec..1919d5d7e2 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl @@ -43,7 +43,7 @@ join(Name) -> ok = pg:join(?FEDERATION_PG_SCOPE, pgname(Name), self()). all() -> - pg:get_members(pgname(rabbit_federation_queues)). + pg:get_members(?FEDERATION_PG_SCOPE, pgname(rabbit_federation_queues)). q(QName) -> case pg:get_members(?FEDERATION_PG_SCOPE, pgname({rabbit_federation_queue, QName})) of |