summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_amqqueue.erl3
-rw-r--r--src/rabbit_mirror_queue_master.erl2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index ae96f73999..3169948bab 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -174,8 +174,7 @@
-spec(start_mirroring/1 :: (pid()) -> 'ok').
-spec(stop_mirroring/1 :: (pid()) -> 'ok').
-spec(sync/2 :: (binary(), rabbit_types:vhost()) ->
- 'ok' | rabbit_types:error('pending_acks' | 'not_mirrored' |
- 'already_synced')).
+ 'ok' | rabbit_types:error('pending_acks' | 'not_mirrored')).
-endif.
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 03a712d683..c9b6269b58 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -145,7 +145,7 @@ sync_mirrors(State = #state { name = QName,
{shutdown, R, BQS1} -> {stop, R, S(BQS1)};
{sync_died, R, BQS1} -> Log("~p", [R]),
{ok, S(BQS1)};
- {already_synced, BQS1} -> {{error, already_synced}, S(BQS1)};
+ {already_synced, BQS1} -> {ok, S(BQS1)};
{ok, BQS1} -> Log("complete", []),
{ok, S(BQS1)}
end.