diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
| commit | aa8d7f00d3ae279a0bac46137933540b009aa86d (patch) | |
| tree | 47b1637f3df7d8f895ba2b5f85f8f92f35232327 /src | |
| parent | 32b59f88115699f139a15621aaa36c01542c20fe (diff) | |
| download | rabbitmq-server-git-aa8d7f00d3ae279a0bac46137933540b009aa86d.tar.gz | |
Do not generate config in prelaunch. Copy rabbitmq.schema to SCHEMA_DIR
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_config.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_prelaunch.erl | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl index 6ff0ec67dc..2cdf19793a 100644 --- a/src/rabbit_config.erl +++ b/src/rabbit_config.erl @@ -6,7 +6,8 @@ prepare_config/1, update_app_config/1, schema_dir/0, - config_files/0 + config_files/0, + get_advanced_config/0 ]). prepare_and_use_config() -> diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 9657a3e38a..3f83a153ea 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -102,13 +102,9 @@ get_config(File) -> case rabbit_file:is_file(File ++ ".config") of true -> file:consult(File ++ ".config"); false -> - case rabbit_file:is_file(File ++ ".conf") of - true -> - case rabbit_config:prepare_config([[File]]) of - {ok, ConfigFile} -> file:consult(ConfigFile); - _ -> {error, generation_error} - end; - false -> {error, enoent} + case rabbit_config:get_advanced_config() of + none -> {error, enoent}; + FileName -> file:consult(FileName) end end. |