diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-02-17 16:39:06 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-02-17 16:39:06 +0400 |
| commit | e4d3663b404be91810ff5d8c8e0d4867e91d3695 (patch) | |
| tree | f654b62c9b16f7c138260ef6e99a30b1edff8804 /src/rabbit.erl | |
| parent | 63e8d9ce0c1b459aa02d7f4a9191bf35f46b373a (diff) | |
| download | rabbitmq-server-git-e4d3663b404be91810ff5d8c8e0d4867e91d3695.tar.gz | |
Format alarms in rabbitmqctl status
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 80113a61aa..65643d4026 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, rabbit_alarm:get_alarms()}], + {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, @@ -782,3 +782,7 @@ start_fhc() -> rabbit_sup:start_restartable_child( file_handle_cache, [fun rabbit_alarm:set_alarm/1, fun rabbit_alarm:clear_alarm/1]). + +format_alarms(Alarms) -> + %% [{{resource_limit,memory,rabbit@mercurio},[]}] + [Limit || {{resource_limit, Limit, _}, _} <- Alarms]. |