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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +95 -95
1 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9ae294293f - Show all commits

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

@ -243,11 +243,11 @@ namespace fc { namespace http {
{ {
public: public:
generic_websocket_server_impl( const std::string& forward_header_key ) generic_websocket_server_impl( const std::string& forward_header_key )
:_server_thread( fc::thread::current() ), _forward_header_key(forward_header_key) :_server_thread( fc::thread::current() ), _forward_header_key( forward_header_key )
{ {
_server.clear_access_channels( websocketpp::log::alevel::all ); _server.clear_access_channels( websocketpp::log::alevel::all );
_server.init_asio(&fc::asio::default_io_service()); _server.init_asio( &fc::asio::default_io_service() );
_server.set_reuse_addr(true); _server.set_reuse_addr( true );
_server.set_open_handler( [this]( connection_hdl hdl ){ _server.set_open_handler( [this]( connection_hdl hdl ){
_server_thread.async( [this, hdl](){ _server_thread.async( [this, hdl](){
auto new_con = std::make_shared<possibly_proxied_websocket_connection< auto new_con = std::make_shared<possibly_proxied_websocket_connection<
@ -649,8 +649,8 @@ namespace fc { namespace http {
void websocket_server::close() void websocket_server::close()
{ {
for (auto& connection : my->_connections) for( auto& connection : my->_connections )
my->_server.close(connection.first, websocketpp::close::status::normal, "Goodbye"); my->_server.close( connection.first, websocketpp::close::status::normal, "Goodbye" );
} }
websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password, websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password,
@ -708,14 +708,14 @@ namespace fc { namespace http {
void websocket_client::close() void websocket_client::close()
{ {
if (my->_hdl) if( my->_hdl )
my->_client.close(*my->_hdl, websocketpp::close::status::normal, "Goodbye"); my->_client.close( *my->_hdl, websocketpp::close::status::normal, "Goodbye" );
} }
void websocket_client::synchronous_close() void websocket_client::synchronous_close()
{ {
close(); close();
if (my->_closed) if( my->_closed )
my->_closed->wait(); my->_closed->wait();
} }