summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-02-17 15:07:39 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-02-17 15:07:39 +0000
commitb764eff2281eaaa10dd9b99aea8f1bd7b4683790 (patch)
treed57d5fe1fa92807093584f961317f0313734e7ad
parent3a662f95f97a4fc70b29a1abcd8c3bfca4401c16 (diff)
downloadrabbitmq-server-bug25627.tar.gz
Don't crash if the alarm gen_event server is not there (i.e. app is not running).bug25627
-rw-r--r--src/rabbit.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 1eaddffc..ad748d19 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -394,7 +394,7 @@ status() ->
{os, os:type()},
{erlang_version, erlang:system_info(system_version)},
{memory, rabbit_vm:memory()},
- {alarms, format_alarms(rabbit_alarm:get_alarms())}],
+ {alarms, alarms()}],
S2 = rabbit_misc:filter_exit_map(
fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end,
[{vm_memory_high_watermark, {vm_memory_monitor,
@@ -417,7 +417,9 @@ status() ->
end}],
S1 ++ S2 ++ S3 ++ S4.
-format_alarms(Alarms) ->
+alarms() ->
+ Alarms = rabbit_misc:with_exit_handler(rabbit_misc:const([]),
+ fun rabbit_alarm:get_alarms/0),
N = node(),
%% [{{resource_limit,memory,rabbit@mercurio},[]}]
[Limit || {{resource_limit, Limit, Node}, _} <- Alarms, Node =:= N].