Don't explictly close control channel

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 06cc13842219eef4da43da60baf6e98e28c96759..7d60e5dc51a0f47a2d26f8596ee51e4596cd763c 100644 (file)
--- 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 f0a7ded6d727f448d6519f2ba77ca005d00fb778..8d398e9fb4129bb726cbbb8fefaec2a68815d34c 100644 (file)
--- 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();