Unverified Commit fc332edc authored by kladko's avatar kladko

bug/SKALE-3751-enable-zeromq

parent 3e969679
...@@ -165,9 +165,16 @@ void ZMQServer::exitWorkers() { ...@@ -165,9 +165,16 @@ void ZMQServer::exitWorkers() {
} }
void ZMQServer::exitZMQServer() { void ZMQServer::exitZMQServer() {
spdlog::info("Exiting zmq server workers ..."); spdlog::info("Exiting zmq server workers ...");
zmqServer->exitWorkers(); zmqServer->exitWorkers();
spdlog::info("Exited zmq server ..."); spdlog::info("Exited zmq server ...");
spdlog::info("Joining server thread");
ZMQServer::serverThread->join();
spdlog::info("Joined server thread");
spdlog::info("deleting zmq server"); spdlog::info("deleting zmq server");
zmqServer = nullptr; zmqServer = nullptr;
spdlog::info("deleted zmq server "); spdlog::info("deleted zmq server ");
...@@ -199,9 +206,6 @@ shared_ptr <std::thread> ZMQServer::serverThread = nullptr; ...@@ -199,9 +206,6 @@ shared_ptr <std::thread> ZMQServer::serverThread = nullptr;
ZMQServer::~ZMQServer() { ZMQServer::~ZMQServer() {
spdlog::info("Joining server thread");
serverThread->join();
spdlog::info("Joined server thread");
spdlog::info("Deleting server thread"); spdlog::info("Deleting server thread");
ZMQServer::serverThread = nullptr; ZMQServer::serverThread = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment