4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 20:36:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2928

Browse Source 
d28c388f p2p: stop net server before closing starting connections (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-25 21:19:58 +02:00
commit c611cca462
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/p2p/net_node.inl
View File

@ -649,6 +649,10 @@ namespace nodetool
template<class t_payload_net_handler> template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::send_stop_signal() 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; std::list<boost::uuids::uuid> connection_ids;
m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt) { m_net_server.get_config_object().foreach_connection([&](const p2p_connection_context& cntxt) {
connection_ids.push_back(cntxt.m_connection_id); connection_ids.push_back(cntxt.m_connection_id);
@ -658,8 +662,7 @@ namespace nodetool
m_net_server.get_config_object().close(connection_id); m_net_server.get_config_object().close(connection_id);
m_payload_handler.stop(); m_payload_handler.stop();
m_net_server.send_stop_signal();
MDEBUG("[node] Stop signal sent");
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------