aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-12-25 21:19:58 +0200
committerRiccardo Spagni <ric@spagni.net>2017-12-25 21:19:58 +0200
commitc611cca4624e3556a5e68b745acbcfbfab71618a (patch)
treea7e982fdca0d0eab1aef0d80c445ea5c368629d7
parentMerge pull request #2926 (diff)
parentp2p: stop net server before closing starting connections (diff)
downloadmonero-c611cca4624e3556a5e68b745acbcfbfab71618a.tar.xz
Merge pull request #2928
d28c388f p2p: stop net server before closing starting connections (moneromooo-monero)
-rw-r--r--src/p2p/net_node.inl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index b6ef530d1..269a9ba87 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -649,6 +649,10 @@ namespace nodetool
template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::send_stop_signal()
{
+ MDEBUG("[node] sending stop signal");
+ m_net_server.send_stop_signal();
+ MDEBUG("[node] Stop signal sent");
+
std::list<boost::uuids::uuid> connection_ids;
m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt) {
connection_ids.push_back(cntxt.m_connection_id);
@@ -658,8 +662,7 @@ namespace nodetool
m_net_server.get_config_object().close(connection_id);
m_payload_handler.stop();
- m_net_server.send_stop_signal();
- MDEBUG("[node] Stop signal sent");
+
return true;
}
//-----------------------------------------------------------------------------------