summaryrefslogtreecommitdiff
path: root/src
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
commit6e1809e5497c14cb4ae176ad7eb5eaf4f41fdf39 (patch)
tree1d247eaa4a52e1b80d40082bf6616182a0de4ba6 /src
parent040a6ffbff8d2d38fde6bec97615510907ef5dbd (diff)
parent54d75b7c6650303d6e288ed23f06d9fbeba4affc (diff)
downloadrabbitmq-server-git-6e1809e5497c14cb4ae176ad7eb5eaf4f41fdf39.tar.gz
merge stable into default
Diffstat (limited to 'src')
-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 529d46b45a..f903677b98 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",