diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-01-07 12:39:21 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-01-07 12:39:21 +0000 |
| commit | 624ac5e44c6b3b036bd3c059ccb193ffe217aad3 (patch) | |
| tree | e19cc0aaa9a6530e3eb8759e003d0785927b059a | |
| parent | 991431757e40f37cbaeccbfaf2c1ed3830f3defc (diff) | |
| download | rabbitmq-server-git-624ac5e44c6b3b036bd3c059ccb193ffe217aad3.tar.gz | |
Idempotence
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 64d55684b9..bb1a5f86c8 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1166,7 +1166,7 @@ handle_call(sync_mirrors, _From, State) -> %% By definition if we get this message here we do not have to do anything. handle_call(cancel_sync_mirrors, _From, State) -> - reply({error, not_syncing}, State); + reply({ok, not_syncing}, State); handle_call(force_event_refresh, _From, State = #q{exclusive_consumer = Exclusive}) -> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 9f48877c8e..0f1620bffb 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -161,6 +161,12 @@ start() -> false -> io:format("...done.~n") end, rabbit_misc:quit(0); + {ok, Info} -> + case Quiet of + true -> ok; + false -> io:format("...done (~p).~n", [Info]) + end, + rabbit_misc:quit(0); {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} -> %% < R15 PrintInvalidCommandError(), usage(); |