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

partial fixes to crashing on websocket client close

Browse source
This commit is contained in:
Daniel Larimer 2015-05-12 17:15:00 -04:00
parent c28ed38f1a
commit 9ef91e2245
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fc/network/http/websocket.hpp
View file

@ -17,7 +17,7 @@ namespace fc { namespace http {
class websocket_connection class websocket_connection
{ {
public: public:
virtual ~websocket_connection(){}; virtual ~websocket_connection(){ wlog("."); };
virtual void send_message( const std::string& message ) = 0; virtual void send_message( const std::string& message ) = 0;
virtual void close( int64_t code, const std::string& reason ){}; virtual void close( int64_t code, const std::string& reason ){};
void on_message( const std::string& message ) { _on_message(message); } void on_message( const std::string& message ) { _on_message(message); }

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

@ -145,10 +145,12 @@ namespace fc { namespace http {
public: public:
websocket_connection_impl( T con ) websocket_connection_impl( T con )
:_ws_connection(con){ :_ws_connection(con){
wdump((uint64_t(this)));
} }
~websocket_connection_impl() ~websocket_connection_impl()
{ {
wdump((uint64_t(this)));
} }
virtual void send_message( const std::string& message )override virtual void send_message( const std::string& message )override
@ -446,10 +448,23 @@ namespace fc { namespace http {
}); });
_client.set_close_handler( [=]( connection_hdl hdl ){ _client.set_close_handler( [=]( connection_hdl hdl ){
if( _connection ) if( _connection )
_client_thread.async( [&](){ if( _connection ) _connection->closed(); _connection.reset(); } ).wait(); {
if( _closed ) _closed->set_value(); try {
_client_thread.async( [&](){
wlog(". ${p}", ("p",uint64_t(_connection.get())));
if( !_shutting_down && !_closed && _connection )
_connection->closed();
_connection.reset();
} ).wait();
} catch ( const fc::exception& e )
{
if( _closed ) _closed->set_exception( e.dynamic_copy_exception() );
}
if( _closed ) _closed->set_value();
}
}); });
_client.set_fail_handler( [=]( connection_hdl hdl ){ _client.set_fail_handler( [=]( connection_hdl hdl ){
elog( "." );
auto con = _client.get_con_from_hdl(hdl); auto con = _client.get_con_from_hdl(hdl);
auto message = con->get_ec().message(); auto message = con->get_ec().message();
if( _connection ) if( _connection )
@ -480,10 +495,13 @@ namespace fc { namespace http {
{ {
if(_connection ) if(_connection )
{ {
wlog(".");
_shutting_down = true;
_connection->close(0, "client closed"); _connection->close(0, "client closed");
_closed->wait(); _closed->wait();
} }
} }
bool _shutting_down = false;
fc::promise<void>::ptr _connected; fc::promise<void>::ptr _connected;
fc::promise<void>::ptr _closed; fc::promise<void>::ptr _closed;
fc::thread& _client_thread; fc::thread& _client_thread;