bug/SKALE-3751-enable-zeromq

ServerInit.cpp

@@ -88,7 +88,7 @@ void systemHealthCheck() {
     }
 }
 
-static ZMQServer *zmqServer = nullptr;
+
 
 
 void initUserSpace() {
@@ -107,12 +107,6 @@ void initUserSpace() {
 
 }
 
-void exitZMQServer() {
-    spdlog::info("Exiting zmq server ...");
-    zmqServer->exitWorkers();
-    spdlog::info("Exited zmq server ...");
-    zmqServer = nullptr;
-}
 
 uint64_t initEnclave() {
 
@@ -210,14 +204,14 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign, bool _generate
             SGXWalletServer::initHttpsServer(_checkCert);
             SGXRegistrationServer::initRegistrationServer(_autoSign);
             CSRManagerServer::initCSRManagerServer();
-            zmqServer = new ZMQServer();
-            static std::thread serverThread(std::bind(&ZMQServer::run, zmqServer));
+            ZMQServer::zmqServer = new ZMQServer();
+            static std::thread serverThread(std::bind(&ZMQServer::run, ZMQServer::zmqServer));
             serverThread.detach();
 
         } else {
             SGXWalletServer::initHttpServer();
-            zmqServer = new ZMQServer();
-            static std::thread serverThread(std::bind(&ZMQServer::run, zmqServer));
+            ZMQServer::zmqServer = new ZMQServer();
+            static std::thread serverThread(std::bind(&ZMQServer::run, ZMQServer::zmqServer));
             serverThread.detach();
         }
         SGXInfoServer::initInfoServer(_logLevel, _checkCert, _autoSign, _generateTestKeys);

ZMQServer.cpp

@@ -30,6 +30,8 @@
 
 using namespace std;
 
+ZMQServer *ZMQServer::zmqServer = nullptr;
+
 ZMQServer::ZMQServer()
         : isExitRequested(false), ctx_(make_shared<zmq::context_t>(1)),
           frontend_(*ctx_, ZMQ_ROUTER),
@@ -141,3 +143,9 @@ void ZMQServer::exitWorkers() {
 }
 
 
+void ZMQServer::exitZMQServer() {
+    spdlog::info("Exiting zmq server ...");
+    zmqServer->exitWorkers();
+    spdlog::info("Exited zmq server ...");
+    zmqServer = nullptr;
+}

ZMQServer.h

@@ -44,6 +44,8 @@ using namespace std;
 class ZMQServer {
 public:
 
+    static ZMQServer *zmqServer;
+
     ZMQServer();
 
     enum {
@@ -54,6 +56,8 @@ public:
 
     void exitWorkers();
 
+    static void exitZMQServer();
+
 private:
     shared_ptr<zmq::context_t> ctx_;
     zmq::socket_t frontend_;

testw.cpp

@@ -58,6 +58,7 @@
 #include "SGXRegistrationServer.h"
 #include "SGXWalletServer.h"
 #include "ZMQClient.h"
+#include "ZMQServer.h"
 #include "sgxwallet.h"
 #include "TestUtils.h"
 #include "testw.h"
@@ -77,7 +78,7 @@ public:
     }
 
     ~TestFixture() {
-        exitZMQServer();
+        ZMQServer::exitZMQServer();
         TestUtils::destroyEnclave();
     }
 };
@@ -91,7 +92,7 @@ public:
     }
 
     ~TestFixtureHTTPS() {
-        exitZMQServer();
+        ZMQServer::exitZMQServer();
         TestUtils::destroyEnclave();
     }
 };
@@ -104,7 +105,7 @@ public:
     }
 
     ~TestFixtureNoResetFromBackup() {
-        exitZMQServer();
+        ZMQServer::exitZMQServer();
         TestUtils::destroyEnclave();
     }
 };
@@ -118,7 +119,7 @@ public:
     }
 
     ~TestFixtureNoReset() {
-        exitZMQServer();
+        ZMQServer::exitZMQServer();
         TestUtils::destroyEnclave();
     }
 };