From be57617405366f32f7306c2281ab38c5ecb562da Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 17 Dec 2024 15:54:26 +0100 Subject: [PATCH] Don't explictly close control channel --- pdns/recursordist/rec-main.cc | 1 - pdns/recursordist/rec_channel_rec.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index 06cc138422..7d60e5dc51 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -2454,7 +2454,6 @@ static void handleRCC(int fileDesc, FDMultiplexer::funcparam_t& /* var */) command(); if (command == doExitNicely) { g_rcc.send(clientfd, answer); - g_rcc.~RecursorControlChannel(); } } catch (const std::exception& e) { diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc index f0a7ded6d7..8d398e9fb4 100644 --- a/pdns/recursordist/rec_channel_rec.cc +++ b/pdns/recursordist/rec_channel_rec.cc @@ -1390,7 +1390,7 @@ void doExitGeneric(bool nicely) std::unique_lock lock(doneRunning.mutex); doneRunning.condVar.wait(lock, [] { return doneRunning.done.load(); }); } - // g_rcc.~RecursorControlChannel() do not call, will be done by caller! + // g_rcc.~RecursorControlChannel() do not call, caller still needs it! } else { g_rcc.~RecursorControlChannel(); -- 2.47.3