From 1c7646f98f2cea17b76edf01e5ee92e90cd05f15 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Tue, 20 Jun 2023 16:53:03 +0200 Subject: [PATCH] ZMQReader: make sure monitor always shuts down --- src/zmq_reader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/zmq_reader.cpp b/src/zmq_reader.cpp index 121585d..1a89c4b 100644 --- a/src/zmq_reader.cpp +++ b/src/zmq_reader.cpp @@ -155,7 +155,11 @@ void ZMQReader::run() LOGERR(1, "failed to start ZMQ monitor thread, error " << uv_err_name(err)); throw zmq::error_t(EMTHREAD); } - ON_SCOPE_LEAVE([this]() { uv_thread_join(&m_monitorThread); }); + + ON_SCOPE_LEAVE([this]() { + m_monitor->abort(); + uv_thread_join(&m_monitorThread); + }); LOGINFO(1, "worker thread ready"); @@ -166,7 +170,6 @@ void ZMQReader::run() } if (m_stopped) { - m_monitor->abort(); break; }