diff options
| author | Michael Klishin <michael@novemberain.com> | 2019-03-15 03:33:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 03:33:11 +0300 |
| commit | 9bc3386e5816732ff88ef0613a12ba0bf0043516 (patch) | |
| tree | d069fa2f241a812a48c51648cd2d4f9ea89a8577 /src/rabbit.erl | |
| parent | c46020f15646febe2d32653defa0e94e55ff144a (diff) | |
| parent | a2dabd48b8300cdf091b5788508837bffcd76fbe (diff) | |
| download | rabbitmq-server-git-9bc3386e5816732ff88ef0613a12ba0bf0043516.tar.gz | |
Merge pull request #1913 from rabbitmq/rabbitmq-server-1869
Move TCP and TLS listener startup to the last boot step "stage"
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 20f9b17abf..003abd141f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -197,43 +197,52 @@ -rabbit_boot_step({routing_ready, [{description, "message delivery logic ready"}, - {requires, core_initialized}]}). - --rabbit_boot_step({direct_client, - [{description, "direct client"}, - {mfa, {rabbit_direct, boot, []}}, - {requires, routing_ready}]}). + {requires, [core_initialized, recovery]}]}). -rabbit_boot_step({connection_tracking, - [{description, "sets up internal storage for node-local connections"}, + [{description, "connection tracking infrastructure"}, {mfa, {rabbit_connection_tracking, boot, []}}, - {requires, routing_ready}]}). - --rabbit_boot_step({networking, - [{mfa, {rabbit_networking, boot, []}}, - {requires, routing_ready}]}). - --rabbit_boot_step({notify_cluster, - [{description, "notify cluster nodes"}, - {mfa, {rabbit_node_monitor, notify_node_up, []}}, - {requires, networking}]}). + {enables, routing_ready}]}). -rabbit_boot_step({background_gc, [{description, "background garbage collection"}, {mfa, {rabbit_sup, start_restartable_child, [background_gc]}}, - {enables, networking}]}). + {requires, [core_initialized, recovery]}, + {enables, routing_ready}]}). -rabbit_boot_step({rabbit_core_metrics_gc, [{description, "background core metrics garbage collection"}, {mfa, {rabbit_sup, start_restartable_child, [rabbit_core_metrics_gc]}}, - {enables, networking}]}). + {requires, [core_initialized, recovery]}, + {enables, routing_ready}]}). -rabbit_boot_step({rabbit_looking_glass, [{description, "Looking Glass tracer and profiler"}, {mfa, {rabbit_looking_glass, boot, []}}, - {requires, networking}]}). + {requires, [core_initialized, recovery]}, + {enables, routing_ready}]}). + +-rabbit_boot_step({pre_flight, + [{description, "ready to communicate with peers and clients"}, + {requires, [core_initialized, recovery, routing_ready]}]}). + +-rabbit_boot_step({direct_client, + [{description, "direct client"}, + {mfa, {rabbit_direct, boot, []}}, + {requires, pre_flight} + ]}). + +-rabbit_boot_step({notify_cluster, + [{description, "notifies cluster peers of our presence"}, + {mfa, {rabbit_node_monitor, notify_node_up, []}}, + {requires, pre_flight}]}). + +-rabbit_boot_step({networking, + [{description, "TCP and TLS listeners"}, + {mfa, {rabbit_networking, boot, []}}, + {requires, notify_cluster}]}). %%--------------------------------------------------------------------------- |