Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on exit

Browse source
This commit is contained in:
Nathan Hourt 2015-08-14 14:08:16 -04:00
parent cb006ba03c
commit 9c868b3927
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/network/http/websocket.cpp
View file

@ -228,6 +228,8 @@ namespace fc { namespace http {
{ {
wlog( "unknown connection closed" ); wlog( "unknown connection closed" );
} }
if( _connections.empty() && _closed )
_closed->set_value();
}).wait(); }).wait();
}); });
@ -244,17 +246,25 @@ namespace fc { namespace http {
{ {
wlog( "unknown connection failed" ); wlog( "unknown connection failed" );
} }
if( _connections.empty() && _closed )
_closed->set_value();
}).wait(); }).wait();
} }
}); });
} }
~websocket_server_impl() ~websocket_server_impl()
{ {
if( _server.is_listening() ) if( _server.is_listening() )
_server.stop_listening(); _server.stop_listening();
if( _connections.size() )
_closed = new fc::promise<void>();
auto cpy_con = _connections; auto cpy_con = _connections;
for( auto item : cpy_con ) for( auto item : cpy_con )
_server.close( item.first, 0, "server exit" ); _server.close( item.first, 0, "server exit" );
if( _closed ) _closed->wait();
} }
typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map; typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;