1 files changed, 20 insertions, 17 deletions

diff --git a/src/cluster.c b/src/cluster.c
index b1b4e645d..f7603611f 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -694,11 +694,31 @@ void clusterInit(void) {
         exit(1);
     }
 
+    /* Initialize data for the Slot to key API. */
+    slotToKeyInit(server.db);
+
+    /* The slots -> channels map is a radix tree. Initialize it here. */
+    server.cluster->slots_to_channels = raxNew();
+
+    /* Set myself->port/cport/pport to my listening ports, we'll just need to
+     * discover the IP address via MEET messages. */
+    deriveAnnouncedPorts(&myself->port, &myself->pport, &myself->cport);
+
+    server.cluster->mf_end = 0;
+    server.cluster->mf_slave = NULL;
+    resetManualFailover();
+    clusterUpdateMyselfFlags();
+    clusterUpdateMyselfIp();
+    clusterUpdateMyselfHostname();
+}
+
+void clusterInitListeners(void) {
     if (connectionIndexByType(connTypeOfCluster()->get_type(NULL)) < 0) {
         serverLog(LL_WARNING, "Missing connection type %s, but it is required for the Cluster bus.", connTypeOfCluster()->get_type(NULL));
         exit(1);
     }
 
+    int port = server.tls_cluster ? server.tls_port : server.port;
     connListener *listener = &server.clistener;
     listener->count = 0;
     listener->bindaddr = server.bindaddr;
@@ -714,23 +734,6 @@ void clusterInit(void) {
     if (createSocketAcceptHandler(&server.clistener, clusterAcceptHandler) != C_OK) {
         serverPanic("Unrecoverable error creating Redis Cluster socket accept handler.");
     }
-
-    /* Initialize data for the Slot to key API. */
-    slotToKeyInit(server.db);
-
-    /* The slots -> channels map is a radix tree. Initialize it here. */
-    server.cluster->slots_to_channels = raxNew();
-
-    /* Set myself->port/cport/pport to my listening ports, we'll just need to
-     * discover the IP address via MEET messages. */
-    deriveAnnouncedPorts(&myself->port, &myself->pport, &myself->cport);
-
-    server.cluster->mf_end = 0;
-    server.cluster->mf_slave = NULL;
-    resetManualFailover();
-    clusterUpdateMyselfFlags();
-    clusterUpdateMyselfIp();
-    clusterUpdateMyselfHostname();
 }
 
 /* Reset a node performing a soft or hard reset: