summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-10-08 17:40:42 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-10-08 17:40:42 +0100
commitc94405c5c24d1401050ed9942b6fa4c6851a3e60 (patch)
tree242a13464a63d8bbc1c9971841034d3844ca2c1d
parentc76a13966745cbcdb641488318468731396fe91a (diff)
downloadrabbitmq-server-c94405c5c24d1401050ed9942b6fa4c6851a3e60.tar.gz
Return environment for all apps.
-rw-r--r--src/rabbit.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 1dd7c1e9..664da206 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -470,8 +470,13 @@ is_running() -> is_running(node()).
is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit).
environment() ->
- lists:keysort(1, [P || P = {K, _} <- application:get_all_env(rabbit),
- K =/= default_pass]).
+ [{A, environment(A)} ||
+ {A, _, _} <- lists:keysort(1, application:which_applications())].
+
+environment(App) ->
+ Ignore = [default_pass, included_applications],
+ lists:keysort(1, [P || P = {K, _} <- application:get_all_env(App),
+ not lists:member(K, Ignore)]).
rotate_logs(BinarySuffix) ->
Suffix = binary_to_list(BinarySuffix),