diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp index 8225823..11db65c 100644 --- a/include/fc/network/http/websocket.hpp +++ b/include/fc/network/http/websocket.hpp @@ -55,7 +55,6 @@ namespace fc { namespace http { void stop_listening(); void close(); - void synchronous_close(); private: friend class detail::websocket_server_impl; diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp index be29768..dbff4bc 100644 --- a/src/network/http/websocket.cpp +++ b/src/network/http/websocket.cpp @@ -649,14 +649,6 @@ namespace fc { namespace http { my->_server.close(connection.first, websocketpp::close::status::normal, "Goodbye"); } - void websocket_server::synchronous_close() - { - close(); - if (my->_closed) - my->_closed->wait(); - } - - websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password ):my( new detail::websocket_tls_server_impl(server_pem, ssl_password) ) {} diff --git a/tests/api_tests.cpp b/tests/api_tests.cpp index 00997ad..9f9b3a4 100644 --- a/tests/api_tests.cpp +++ b/tests/api_tests.cpp @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(login_test) { BOOST_CHECK(remote_triggered); client->synchronous_close(); - server->synchronous_close(); + server->close(); fc::usleep(fc::milliseconds(50)); client.reset(); server.reset(); @@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(optionals_test) { BOOST_CHECK_EQUAL(remote_optionals->foo("a", {}, "c"), "[\"a\",null,\"c\"]"); client->synchronous_close(); - server->synchronous_close(); + server->close(); fc::usleep(fc::milliseconds(50)); client.reset(); server.reset();