From ea14a608546e0ed22187ffa2a83d5b5ffd2fe102 Mon Sep 17 00:00:00 2001
From: j-berman <justinberman@protonmail.com>
Date: Tue, 28 Apr 2026 22:10:36 -0700
Subject: [PATCH] daemon: on exit, stop the payload handler before closing cxns

---
 src/p2p/net_node.inl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 30e32bb04..a67c684a9 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -1107,6 +1107,8 @@ namespace nodetool
   template<class t_payload_net_handler>
   bool node_server<t_payload_net_handler>::send_stop_signal()
   {
+    MDEBUG("[node] stopping server payload handler");
+    m_payload_handler.stop();
     MDEBUG("[node] sending stop signal");
     for (auto& zone : m_network_zones)
     {
@@ -1129,7 +1131,6 @@ namespace nodetool
       zone.second.m_net_server.send_stop_signal(close_all_connections);
     }
     MDEBUG("[node] Stop signal sent");
-    m_payload_handler.stop();
     return true;
   }
   //-----------------------------------------------------------------------------------