diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-06-10 10:51:14 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-06-10 10:51:14 +0200 |
| commit | 0f8974930d0719dc152ef65c7aace87ac1b80e54 (patch) | |
| tree | 6acc23ea73cdb6713c7e00ec589749fbb687c5f5 /apps | |
| parent | 4aafa785086357a32c6f7953a93956630a94bbc2 (diff) | |
| download | rabbitmq-server-git-0f8974930d0719dc152ef65c7aace87ac1b80e54.tar.gz | |
rabbit_prelaunch: Load configuration before Erlang dist. is started
The reason is that kernel's `net_ticktime` can be configured in the
Cuttlefish or Erlang configuration files. If we start the distribution
first, then the configuration parameter is ignored.
Fixes #2377.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl index ef15f47a75..b6b29481c7 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl @@ -104,12 +104,12 @@ do_run() -> %% 1. Erlang/OTP compatibility check. ok = rabbit_prelaunch_erlang_compat:check(Context), - %% 2. Erlang distribution check + start. - ok = rabbit_prelaunch_dist:setup(Context), - - %% 3. Configuration check + loading. + %% 2. Configuration check + loading. ok = rabbit_prelaunch_conf:setup(Context), + %% 3. Erlang distribution check + start. + ok = rabbit_prelaunch_dist:setup(Context), + %% 4. Write PID file. rabbit_log_prelaunch:debug(""), _ = write_pid_file(Context), |