diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-08 16:25:36 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-08 16:25:36 +0000 |
| commit | 85b811e30b792c42d1c1f087eaec41725f64d06f (patch) | |
| tree | 53c884026594befc2a99d90caecf5f61b649fe54 /src/rabbit.erl | |
| parent | b27e7d1dfb889df1b2c98c6101bf8cb3cf281e15 (diff) | |
| download | rabbitmq-server-git-85b811e30b792c42d1c1f087eaec41725f64d06f.tar.gz | |
Config detection in rabbit_config. Always pass generate args to windows script
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index f2f08ff495..2715b80eb5 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -272,9 +272,7 @@ start() -> boot() -> start_it(fun() -> - case rabbit_config:prepare_config() of - {ok, ConfigFile} -> - rabbit_config:update_app_config(ConfigFile); + case rabbit_config:prepare_and_use_config() of {error, Reason} -> log_boot_error_and_exit( generate_config_file, |