diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 13:21:28 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 13:21:28 +0000 |
| commit | a6f9f6542d940e350b75426ed5e03b034cd39771 (patch) | |
| tree | 2fd99c4c6e3fdb00b3fbf46997e52ec65263f336 | |
| parent | ed20f8d6015d218f98553ae1e3e087dcb708176a (diff) | |
| parent | 8f9325962f0712533eafc9532f657f9a54757949 (diff) | |
| download | rabbitmq-server-git-a6f9f6542d940e350b75426ed5e03b034cd39771.tar.gz | |
Merge bug25627
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index fd89fd9525..ad14499a4b 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -393,7 +393,8 @@ status() -> {running_applications, rabbit_misc:which_applications()}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, - {memory, rabbit_vm:memory()}], + {memory, rabbit_vm:memory()}, + {alarms, format_alarms(rabbit_alarm:get_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, @@ -416,6 +417,11 @@ status() -> end}], S1 ++ S2 ++ S3 ++ S4. +format_alarms(Alarms) -> + N = node(), + %% [{{resource_limit,memory,rabbit@mercurio},[]}] + [Limit || {{resource_limit, Limit, Node}, _} <- Alarms, Node =:= N]. + is_running() -> is_running(node()). is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). |