summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-03-17 18:11:25 +0000
committerMichael Klishin <mklishin@pivotal.io>2016-03-17 18:11:25 +0000
commitc55d96cf750568ec89b207bf4aa2058a999b71a1 (patch)
treef6efa409d85d6cf1991e29239c9ae30f8f836d70
parent6e2f094bc73a22a805cbb236ae80378548a3ad47 (diff)
downloadrabbitmq-server-git-c55d96cf750568ec89b207bf4aa2058a999b71a1.tar.gz
Rename function
-rw-r--r--src/rabbit_config.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl
index 2cdf19793a..66af21584b 100644
--- a/src/rabbit_config.erl
+++ b/src/rabbit_config.erl
@@ -11,7 +11,7 @@
]).
prepare_and_use_config() ->
- case erlang_config_used() of
+ case legacy_erlang_term_config_used() of
true ->
%% Use .config file
ok;
@@ -28,7 +28,9 @@ prepare_and_use_config() ->
end
end.
-erlang_config_used() ->
+%% we support both the classic Erlang term
+%% config file (rabbitmq.config) as well as rabbitmq.conf
+legacy_erlang_term_config_used() ->
case init:get_argument(config) of
error -> false;
{ok, [Config | _]} ->
@@ -137,7 +139,7 @@ prepare_plugin_schemas(SchemaDir) ->
config_files() ->
Abs = fun (F, Ex) -> filename:absname(filename:rootname(F, Ex) ++ Ex) end,
- case erlang_config_used() of
+ case legacy_erlang_term_config_used() of
true ->
case init:get_argument(config) of
{ok, Files} -> [Abs(File, ".config") || [File] <- Files];