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

Websocket shouldn't cleanup default_io_service, that should only happen ONE time when main exits.

Browse source
This commit is contained in:
Daniel Larimer 2015-07-24 08:32:38 -04:00
parent d76a15ec89
commit d79855b491
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,13 +249,12 @@ namespace fc { namespace http {
}); });
} }
~websocket_server_impl() ~websocket_server_impl()
{ {
if( _server.is_listening() ) if( _server.is_listening() )
_server.stop_listening(); _server.stop_listening();
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" );
fc::asio::default_io_service(true);
} }
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;
@ -360,7 +359,6 @@ namespace fc { namespace http {
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" );
fc::asio::default_io_service(true);
} }
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;