diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-09-19 15:24:29 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-09-19 15:24:29 +0300 |
| commit | 97bfbf6b999923b0183a11fc37eff2ce0d8a4b9d (patch) | |
| tree | dcda76cd904e160d0eacb02e7aa88c5310e6ef1b /src | |
| parent | 05ac795e631282141eed1e3b9102cb8ff4db7dd8 (diff) | |
| parent | 7a53030deadc9109ad14113e81a0e18cbe9bf3db (diff) | |
| download | rabbitmq-server-git-97bfbf6b999923b0183a11fc37eff2ce0d8a4b9d.tar.gz | |
Merge branch 'master' into rabbitmq-server-501
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_autoheal.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_autoheal.erl b/src/rabbit_autoheal.erl index 9d6bfff5fc..3adcc09692 100644 --- a/src/rabbit_autoheal.erl +++ b/src/rabbit_autoheal.erl @@ -245,7 +245,7 @@ handle_msg({become_winner, _}, %% Something has happened to the leader, it might have seen us down but we %% are still alive. Partitions have changed, cannot continue. rabbit_log:info("Autoheal: I am the winner and received another healing " - "request, partitions have changed. Aborting ~n", [Losers]), + "request, partitions have changed to ~p. Aborting ~n", [Losers]), winner_finish(Losers), not_healing; diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 017d1d1fa2..fe1168f120 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -363,7 +363,7 @@ handle_cast({gm_deaths, DeadGMPids}, %% NOTE: Reported deaths here, could be inconsistant. rabbit_mirror_queue_misc:report_deaths(MPid, false, QueueName, DeadPids), - {stop, normal, State}; + {stop, shutdown, State}; {error, not_found} -> {stop, normal, State} end; |