bug/SKALE-3751-enable-zeromq

ServerInit.cpp

@@ -202,17 +202,12 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign, bool _generate
 
         if (useHTTPS) {
             SGXWalletServer::initHttpsServer(_checkCert);
+            ZMQServer::initZMQServer(_checkCert);
             SGXRegistrationServer::initRegistrationServer(_autoSign);
             CSRManagerServer::initCSRManagerServer();
-            ZMQServer::zmqServer = new ZMQServer();
-            static std::thread serverThread(std::bind(&ZMQServer::run, ZMQServer::zmqServer));
-            serverThread.detach();
-
         } else {
             SGXWalletServer::initHttpServer();
-            ZMQServer::zmqServer = new ZMQServer();
-            static std::thread serverThread(std::bind(&ZMQServer::run, ZMQServer::zmqServer));
-            serverThread.detach();
+            ZMQServer::initZMQServer(_checkCert);
         }
         SGXInfoServer::initInfoServer(_logLevel, _checkCert, _autoSign, _generateTestKeys);
 

ZMQServer.cpp

@@ -149,3 +149,11 @@ void ZMQServer::exitZMQServer() {
     spdlog::info("Exited zmq server ...");
     zmqServer = nullptr;
 }
+
+void ZMQServer::initZMQServer(bool _useClientCert) {
+    spdlog::info("Initing zmq server ...");
+    zmqServer = new ZMQServer();
+    static std::thread serverThread(std::bind(&ZMQServer::run, ZMQServer::zmqServer));
+    serverThread.detach();
+    spdlog::info("Inited zmq server ...");
+}
\ No newline at end of file

ZMQServer.h

@@ -56,8 +56,11 @@ public:
 
     void exitWorkers();
 
+    static void initZMQServer(bool _useClientCert);
     static void exitZMQServer();
 
+
+
 private:
     shared_ptr<zmq::context_t> ctx_;
     zmq::socket_t frontend_;