From a20a2fe6e0471bd5018b41cdf4ce15fdc46e799c Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 20 Jun 2025 11:16:27 +0200
Subject: [PATCH] cluster/zeromq: Move log_push creation to DoInit()

The log_push socket should be affected by the IPV6 option, so need to
delay its creation a bit.
---
 src/cluster/backend/zeromq/ZeroMQ.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cluster/backend/zeromq/ZeroMQ.cc b/src/cluster/backend/zeromq/ZeroMQ.cc
index c2c5ac52a9..f8d2fe8aed 100644
--- a/src/cluster/backend/zeromq/ZeroMQ.cc
+++ b/src/cluster/backend/zeromq/ZeroMQ.cc
@@ -72,10 +72,8 @@ constexpr DebugFlag operator&(uint8_t x, DebugFlag y) { return static_cast<Debug
 
 ZeroMQBackend::ZeroMQBackend(std::unique_ptr<EventSerializer> es, std::unique_ptr<LogSerializer> ls,
                              std::unique_ptr<detail::EventHandlingStrategy> ehs)
-    : ThreadedBackend("ZeroMQ", std::move(es), std::move(ls), std::move(ehs)) {
-    log_push = zmq::socket_t(ctx, zmq::socket_type::push);
-    main_inproc = zmq::socket_t(ctx, zmq::socket_type::pair);
-}
+    : ThreadedBackend("ZeroMQ", std::move(es), std::move(ls), std::move(ehs)),
+      main_inproc(zmq::socket_t(ctx, zmq::socket_type::pair)) {}
 
 ZeroMQBackend::~ZeroMQBackend() {
     try {
@@ -163,6 +161,7 @@ void ZeroMQBackend::DoTerminate() {
 bool ZeroMQBackend::DoInit() {
     xsub = zmq::socket_t(ctx, zmq::socket_type::xsub);
     xpub = zmq::socket_t(ctx, zmq::socket_type::xpub);
+    log_push = zmq::socket_t(ctx, zmq::socket_type::push);
     log_pull = zmq::socket_t(ctx, zmq::socket_type::pull);
     child_inproc = zmq::socket_t(ctx, zmq::socket_type::pair);