diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-07-12 19:16:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-12 19:16:45 +0300 |
| commit | 9c9301917b84f6ad6b3b844ff76523c7b3bd1903 (patch) | |
| tree | 4eedb050724544c5b23726e44fc8dead142b85ff | |
| parent | cd38d35639d6f23d295d56b69f3537eb0909476a (diff) | |
| parent | 4b47cf789309339a7fae316991e86241f65314c4 (diff) | |
| download | rabbitmq-server-git-9c9301917b84f6ad6b3b844ff76523c7b3bd1903.tar.gz | |
Merge pull request #2406 from rabbitmq/rabbitmq-server-2405
Move networking boot step to end of startup
| -rw-r--r-- | src/rabbit.erl | 14 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 537aa58d81..60a0654340 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -241,8 +241,8 @@ {requires, pre_flight}]}). -rabbit_boot_step({networking, - [{description, "TCP and TLS listeners"}, - {mfa, {rabbit_networking, boot, []}}, + [{description, "TCP and TLS listeners (backwards compatibility)"}, + {mfa, {rabbit_log, debug, ["'networking' boot step skipped and moved to end of startup", []]}}, {requires, notify_cluster}]}). %%--------------------------------------------------------------------------- @@ -919,7 +919,15 @@ do_run_postlaunch_phase() -> rabbit_plugins:strictly_plugins(rabbit_plugins:active())), %% export definitions after all plugins have been enabled, %% see rabbitmq/rabbitmq-server#2384 - rabbit_definitions:maybe_load_definitions() + case rabbit_definitions:maybe_load_definitions() of + ok -> ok; + DefLoadError -> throw(DefLoadError) + end, + + %% start listeners after all plugins have been enabled, + %% see rabbitmq/rabbitmq-server#2405 + rabbit_log_prelaunch:info("Ready to start client connection listeners"), + ok = rabbit_networking:boot() catch throw:{error, _} = Error -> rabbit_prelaunch_errors:log_error(Error), diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 1c32a88776..d31c1e825b 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -71,6 +71,7 @@ boot() -> ok = record_distribution_listener(), _ = application:start(ranch), + rabbit_log:debug("Started Ranch"), %% Failures will throw exceptions _ = boot_listeners(fun boot_tcp/1, application:get_env(rabbit, num_tcp_acceptors, 10), "TCP"), _ = boot_listeners(fun boot_tls/1, application:get_env(rabbit, num_ssl_acceptors, 10), "TLS"), |