From d79855b49107e7ca488db3dfe0a7d4872bf208f1 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Fri, 24 Jul 2015 08:32:38 -0400 Subject: [PATCH] Websocket shouldn't cleanup default_io_service, that should only happen ONE time when main exits. --- src/network/http/websocket.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp index e95175c..7cd613c 100644 --- a/src/network/http/websocket.cpp +++ b/src/network/http/websocket.cpp @@ -249,13 +249,12 @@ namespace fc { namespace http { }); } ~websocket_server_impl() - { + { if( _server.is_listening() ) _server.stop_listening(); auto cpy_con = _connections; for( auto item : cpy_con ) _server.close( item.first, 0, "server exit" ); - fc::asio::default_io_service(true); } typedef std::map > con_map; @@ -360,7 +359,6 @@ namespace fc { namespace http { auto cpy_con = _connections; for( auto item : cpy_con ) _server.close( item.first, 0, "server exit" ); - fc::asio::default_io_service(true); } typedef std::map > con_map;