summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Fedotov <hairyhum@gmail.com>2018-08-09 15:23:16 +0100
committerDaniil Fedotov <hairyhum@gmail.com>2018-08-14 14:19:41 +0100
commit005d3f2f923f0bc6b0b7ad58ceff7db1e623f0fe (patch)
tree1e37d744af2e29efac8139f10b4d48645c3695c7 /src
parent7747cb45e337115fc74466c5ef5730c156411482 (diff)
downloadrabbitmq-server-git-005d3f2f923f0bc6b0b7ad58ceff7db1e623f0fe.tar.gz
Refactor config file discovery. Make advanced config load if no old format config is used
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_config.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl
index de22d298be..ffd1bb882b 100644
--- a/src/rabbit_config.erl
+++ b/src/rabbit_config.erl
@@ -178,9 +178,8 @@ get_advanced_config() ->
case init:get_argument(conf_advanced) of
%% There can be only one advanced.config
{ok, [FileName | _]} ->
- ConfigName = FileName ++ ".config",
- case rabbit_file:is_file(ConfigName) of
- true -> ConfigName;
+ case rabbit_file:is_file(FileName) of
+ true -> FileName;
false -> none
end;
_ -> none