From f602026e532ac6a09e618bcf15e838dd832900f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 15 Jan 2016 11:13:55 +0100 Subject: [PATCH] Use the new rabbit:log_locations/0 API Keys `log_file` and `sasl_log_file` are replaced by a single key `log_files` which returns a list. References rabbitmq/rabbitmq-server#94. --- src/rabbit_mgmt_external_stats.erl | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/rabbit_mgmt_external_stats.erl b/src/rabbit_mgmt_external_stats.erl index c21221a..3817243 100644 --- a/src/rabbit_mgmt_external_stats.erl +++ b/src/rabbit_mgmt_external_stats.erl @@ -35,7 +35,7 @@ proc_used, proc_total, rates_mode, uptime, run_queue, processors, exchange_types, auth_mechanisms, applications, contexts, - log_file, sasl_log_file, db_dir, config_files, net_ticktime, + log_files, db_dir, config_files, net_ticktime, enabled_plugins, persister_stats]). %%-------------------------------------------------------------------- @@ -180,8 +180,7 @@ i(uptime, _State) -> {Total, _} = erlang:statistics(wall_clock), Total; i(rates_mode, _State) -> rabbit_mgmt_db_handler:rates_mode(); i(exchange_types, _State) -> list_registry_plugins(exchange); -i(log_file, _State) -> log_location(kernel); -i(sasl_log_file, _State) -> log_location(sasl); +i(log_files, _State) -> [list_to_binary(F) || F <- rabbit:log_locations()]; i(db_dir, _State) -> list_to_binary(rabbit_mnesia:dir()); i(config_files, _State) -> [list_to_binary(F) || F <- rabbit:config_files()]; i(net_ticktime, _State) -> net_kernel:get_net_ticktime(); @@ -198,12 +197,6 @@ i(applications, _State) -> [format_application(A) || A <- lists:keysort(1, rabbit_misc:which_applications())]. -log_location(Type) -> - case rabbit:log_location(Type) of - tty -> <<"tty">>; - File -> list_to_binary(File) - end. - resource_alarm_set(Source) -> lists:member({{resource_limit, Source, node()},[]}, rabbit_alarm:get_alarms()).