summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-05-20 16:17:18 +0100
committerTim Watson <tim@rabbitmq.com>2013-05-20 16:17:18 +0100
commitd57adac96f217e08a7d9c4ffe739050a70c9ec10 (patch)
tree1d247eaa4a52e1b80d40082bf6616182a0de4ba6
parent9e05c9a33b52da0eb732ce965ba598037b2ddf2c (diff)
parent1dd04d7f15852f3f1b0735aafe82b1e998dc612a (diff)
downloadrabbitmq-server-d57adac96f217e08a7d9c4ffe739050a70c9ec10.tar.gz
merge stable into default
-rw-r--r--src/rabbit_autoheal.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit_autoheal.erl b/src/rabbit_autoheal.erl
index 529d46b4..f903677b 100644
--- a/src/rabbit_autoheal.erl
+++ b/src/rabbit_autoheal.erl
@@ -102,6 +102,12 @@ handle_msg({request_start, Node},
not_healing
end;
+handle_msg({request_start, Node},
+ State, _Partitions) ->
+ rabbit_log:info("Autoheal request received from ~p when in state ~p; "
+ "ignoring~n", [Node, State]),
+ State;
+
handle_msg({become_winner, Losers},
not_healing, _Partitions) ->
rabbit_log:info("Autoheal: I am the winner, waiting for ~p to stop~n",