summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2014-01-14 18:41:47 +0400
committerMichael Klishin <michael@rabbitmq.com>2014-01-14 18:41:47 +0400
commite72eafef211a010dea8f373ce278227835ccfed3 (patch)
tree65d63bb745bd0248d412e65b082318d87df000f1
parentebc2aa448dcf2825508e1a8a101844e133b88e5d (diff)
downloadrabbitmq-server-e72eafef211a010dea8f373ce278227835ccfed3.tar.gz
List alarms in rabbitmqctl status
-rw-r--r--src/rabbit.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 045c5d58..80113a61 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, 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,