summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-02-26 15:49:15 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-02-28 09:42:15 +0100
commit1945c7fc78a026495b9eae63e0b23aa6877f90eb (patch)
tree0abdae7075cee077ec9a2e1311186173a8b30675 /src
parent8ce1f32351a1536f687eb7e797be6e53b283c730 (diff)
downloadrabbitmq-server-git-1945c7fc78a026495b9eae63e0b23aa6877f90eb.tar.gz
rabbit: Do not load configuration twice
It was already loaded in `rabbit_prelaunch` (prelaunch phase 1).
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 65a2e4707e..312e30d4ae 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -349,21 +349,18 @@ run_prelaunch_second_phase() ->
%% 2. Feature flags registry.
ok = rabbit_prelaunch_feature_flags:setup(Context),
- %% 3. Configuration check + loading.
- ok = rabbit_prelaunch_conf:setup(Context),
-
- %% 4. Logging.
+ %% 3. Logging.
ok = rabbit_prelaunch_logging:setup(Context),
case IsInitialPass of
true ->
- %% 5. HiPE compilation.
+ %% 4. HiPE compilation.
ok = rabbit_prelaunch_hipe:setup(Context);
false ->
ok
end,
- %% 6. Clustering.
+ %% 5. Clustering.
ok = rabbit_prelaunch_cluster:setup(Context),
%% Start Mnesia now that everything is ready.