summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-02-01 11:17:57 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-02-01 11:17:57 +0000
commit66d8af5b747d68dcdf1a3b52a2e906aebfb9df24 (patch)
tree90d8b36ab0b420517124a9c87e48373eb35853f6
parentf7190c8cb07ae8e639244be1f94f55bc5278aab3 (diff)
downloadrabbitmq-server-66d8af5b747d68dcdf1a3b52a2e906aebfb9df24.tar.gz
Let's pay attention to whether we actually started or not.
-rw-r--r--src/rabbit_mirror_queue_slave.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index 0c25cf3a..9a5cdfb1 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -91,8 +91,10 @@
start_link(Q) ->
{ok, Pid} = gen_server2:start_link(?MODULE, [], []),
- gen_server2:call(Pid, {init, Q}, infinity),
- {ok, Pid}.
+ case gen_server2:call(Pid, {init, Q}, infinity) of
+ ok -> {ok, Pid};
+ existing -> ignore
+ end.
set_maximum_since_use(QPid, Age) ->
gen_server2:cast(QPid, {set_maximum_since_use, Age}).