rpclib
diff --git a/‎lib/rpc/server.cc
Copy file name to clipboardExpand all lines: lib/rpc/server.cc
+6-1 b/‎lib/rpc/server.cc
Copy file name to clipboardExpand all lines: lib/rpc/server.cc
+6-1
diff --git a/‎tests/rpc/this_server_test.cc
Copy file name to clipboardExpand all lines: tests/rpc/this_server_test.cc
+21-1 b/‎tests/rpc/this_server_test.cc
Copy file name to clipboardExpand all lines: tests/rpc/this_server_test.cc
+21-1
@@ -9,6 +9,7 @@
 #include "asio.hpp"
 #include "format.h"
 
+#include "rpc/this_server.h"
 #include "rpc/detail/dev_utils.h"
 #include "rpc/detail/log.h"
 #include "rpc/detail/log.h"
@@ -62,7 +63,8 @@ struct server::impl {
             } else {
                 LOG_ERROR("Error while accepting connection: {}", ec);
             }
-            start_accept();
+            if (!this_server().stopping())
+                start_accept();
             // TODO: allow graceful exit [sztomi 2016-01-13]
         });
     }
@@ -77,6 +79,9 @@ struct server::impl {
         for (auto &session : sessions_copy) {
             session->close();
         }
+
+        if (this_server().stopping())
+            acceptor_.cancel();
     }
 
     void stop() {
 
@@ -1,5 +1,7 @@
 #include "gtest/gtest.h"
 
+#include <future>
+
 #include "rpc/client.h"
 #include "rpc/server.h"
 #include "rpc/this_server.h"
@@ -24,7 +26,7 @@ class this_server_test : public testing::Test {
     rpc::client c2;
 };
 
-TEST_F(this_server_test, stop) {
+TEST_F(this_server_test, stop_async) {
     s.bind("stop_server", []() { rpc::this_server().stop(); });
     s.async_run();
     c1.call("stop_server");
@@ -35,3 +37,21 @@ TEST_F(this_server_test, stop) {
     EXPECT_EQ(c2.get_connection_state(),
               client::connection_state::disconnected);
 }
+
+TEST_F(this_server_test, stop_sync) {
+    s.bind("stop_server", []() { rpc::this_server().stop(); });
+
+    auto handle = std::async(std::launch::async, [this]() {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        c1.call("stop_server");
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    });
+
+    s.run();
+    handle.get();
+
+    EXPECT_EQ(c1.get_connection_state(),
+              client::connection_state::disconnected);
+    EXPECT_EQ(c2.get_connection_state(),
+              client::connection_state::disconnected);
+}