summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-07-13 18:13:22 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-07-13 18:13:22 +0100
commit1697ec5409d9fe66ec3c8a2c1785b96aba178c5c (patch)
tree9b9fb021c2b8253856be508b9d551ace86f02af2 /src
parent4a6891569352f25737bf5063f6c11886d5e7e5ce (diff)
downloadrabbitmq-server-git-1697ec5409d9fe66ec3c8a2c1785b96aba178c5c.tar.gz
do not blowup on unrecognised alarms
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_alarm.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 94d53e8d28..37d5f3f16f 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -210,6 +210,9 @@ handle_set_alarm({{resource_limit, Source, Node}, []}, State) ->
{ok, maybe_alert(fun dict:append/3, Node, Source, State)};
handle_set_alarm({file_descriptor_limit, []}, State) ->
rabbit_log:warning("file descriptor limit alarm set"),
+ {ok, State};
+handle_set_alarm(Alarm, State) ->
+ rabbit_log:warning("alarm '~p' set", [Alarm]),
{ok, State}.
handle_clear_alarm({resource_limit, Source, Node}, State) ->
@@ -218,4 +221,7 @@ handle_clear_alarm({resource_limit, Source, Node}, State) ->
{ok, maybe_alert(fun dict_unappend/3, Node, Source, State)};
handle_clear_alarm(file_descriptor_limit, State) ->
rabbit_log:warning("file descriptor limit alarm cleared"),
+ {ok, State};
+handle_clear_alarm(Alarm, State) ->
+ rabbit_log:warning("alarm '~p' cleared", [Alarm]),
{ok, State}.