From bae0a91082085a3335eafdb7eeca5afe9a84342b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 12 Apr 2024 22:03:03 +0100 Subject: [PATCH] use SigUtil::setUserSignals before creating SocketPoll MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SocketPoll ctor which may, depending on COOL_WATCHDOG env variable, want to override the SIG2 handler so set user signal handlers before that otherwise tthat choice is overwritten Signed-off-by: Caolán McNamara Change-Id: I305570ab8becb41f0696e60908c1ca26fd9ba14a --- kit/ForKit.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp index 316c571606..6da65d4daa 100644 --- a/kit/ForKit.cpp +++ b/kit/ForKit.cpp @@ -807,6 +807,11 @@ int forkit_main(int argc, char** argv) Log::logger().setLevel(LogLevel); } + // The SocketPoll ctor which may, depending on COOL_WATCHDOG env variable, + // want to override the SIG2 handler so set user signal handlers before + // that otherwise that choice is overwritten + SigUtil::setUserSignals(); + ForKitPoll.reset(new SocketPoll (Util::getThreadName())); ForKitPoll->runOnClientThread(); // We will do the polling on this thread. @@ -822,8 +827,6 @@ int forkit_main(int argc, char** argv) Util::forcedExit(EX_SOFTWARE); } - SigUtil::setUserSignals(); - const int parentPid = getppid(); LOG_INF("ForKit process is ready. Parent: " << parentPid);