fix pro-node initialize

cpp/tools/build_ppc.sh

@@ -35,7 +35,7 @@ default_version="v1.1.0"
 compatibility_version=${default_version}
 command="deploy"
 
-disable_ra2018="false"
+disable_ra2018="true"
 
 LOG_WARN() {
     local content=${1}
@@ -420,9 +420,9 @@ generate_node_config_ini() {
    ; the threadPoolSize
    thread_count = 4
    ; the gatewayService endpoint information
-   service.gateway_target =  
+   gateway_target =  
    ; the components
-   service.components =
+   components =
    nodeid=${nodeid}
 
 [crypto]
@@ -524,8 +524,9 @@ generate_node_config_ini() {
     ; MB
     max_log_file_size=200
     ; LineID, TimeStamp, ProcessID, ThreadName, ThreadID and Message
-    format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
-    enable_rotate_by_hour=false
+    ;format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
+    format=%Severity%|%TimeStamp%|%Message%
+    enable_rotate_by_hour=true
     log_name_pattern=ppcs-psi4ef.log
     ; Y,m,d,H,M,S are supported, N is the sequence number log_%Y%m%d.%H%M%S.%N.log
     rotate_name_pattern=log_%Y%m%d.%H%M.log

cpp/tools/build_wedpr_cem.sh

@@ -377,8 +377,9 @@ generate_config_ini() {
     ; MB
     max_log_file_size=200
     ; LineID, TimeStamp, ProcessID, ThreadName, ThreadID and Message
-    format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
-    enable_rotate_by_hour=false
+    ;format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
+    format=%Severity%|%TimeStamp%|%Message%
+    enable_rotate_by_hour=true
     log_name_pattern=ppcs-psi4ef.log
     ; Y,m,d,H,M,S are supported, N is the sequence number log_%Y%m%d.%H%M%S.%N.log
     rotate_name_pattern=log_%Y%m%d.%H%M.log

cpp/tools/ppc-builder/conf/config-example.toml

@@ -43,7 +43,7 @@ holding_msg_minutes = 30
     # configuration for the ppc-node
     [[agency.node]]
         # disable the ra2018 psi or not, default enable ra2018
-        disable_ra2018 = false
+        disable_ra2018 = true
         deploy_ip=["127.0.0.1:2"]
         # node name, Notice: node_name in the same agency and group must be unique
         node_name = "node0"
@@ -128,7 +128,7 @@ holding_msg_minutes = 30
     # configuration for the ppc-node
     [[agency.node]]
         # disable the ra2018 psi or not, default enable ra2018
-        disable_ra2018 = false
+        disable_ra2018 = true
         deploy_ip=["127.0.0.1:2"]
         # node name, Notice: node_name in the same agency and group must be unique
         node_name = "node0"

cpp/tools/ppc-builder/src/config/ppc_node_config_generator.py

@@ -203,18 +203,18 @@ def __generate_transport_config__(self, config_content, node_config, node_id, de
             ; the threadPoolSize
             thread_count = 4
             ; the gatewayService endpoint information
-            service.gateway_target =  
+            gateway_target =  
             ; the components
-            service.components =
+            components =
             nodeid=
         """
         section = "transport"
         config_content[section]["listen_ip"] = node_config.grpc_listen_ip
         config_content[section]["listen_port"] = str(
             node_config.grpc_listen_port)
         config_content[section]["host_ip"] = deploy_ip
-        config_content[section]["service.gateway_target"] = node_config.gateway_config.gateway_grpc_target
-        config_content[section]["service.components"] = node_config.components
+        config_content[section]["gateway_target"] = node_config.gateway_config.gateway_grpc_target
+        config_content[section]["components"] = node_config.components
         config_content[section]["nodeid"] = node_id
 
     def __generate_ra2018psi_config__(self, config_content, ra2018psi_config):

cpp/tools/ppc-builder/src/tpl/config.ini.gateway

@@ -39,8 +39,9 @@
     ; MB
     max_log_file_size=200
     ; LineID, TimeStamp, ProcessID, ThreadName, ThreadID and Message
-    format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
-    enable_rotate_by_hour=false
+    ;format=%Severity%|ppcs-gateway|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
+    format=%Severity%|%TimeStamp%|%Message%
+    enable_rotate_by_hour=true
     log_name_pattern=ppcs-gateway.log
     ; Y,m,d,H,M,S are supported, N is the sequence number log_%Y%m%d.%H%M%S.%N.log
     rotate_name_pattern=log_%Y%m%d.%H%M.log

cpp/tools/ppc-builder/src/tpl/config.ini.node

@@ -4,7 +4,7 @@
     ; the private key path for the psi-server
     private_key_path = conf/node.pem
     ; disable the ra2018 or not, default enable ra2018
-    disable_ra2018 = false
+    disable_ra2018 = true
     ; the path that allows programs to access
     ; data_location = data
     ; task_timeout_minutes = 180
@@ -38,9 +38,9 @@
    ; the threadPoolSize
    thread_count = 4
    ; the gatewayService endpoint information
-   service.gateway_target =  
+   gateway_target =  
    ; the components
-   service.components =
+   components =
    nodeid=
 
 [storage]
@@ -101,8 +101,9 @@
     ; MB
     max_log_file_size=200
     ; LineID, TimeStamp, ProcessID, ThreadName, ThreadID and Message
-    format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
-    enable_rotate_by_hour=false
+    ;format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
+    format=%Severity%|%TimeStamp%|%Message%
+    enable_rotate_by_hour=true
     log_name_pattern=ppcs-psi4ef.log
     ; Y,m,d,H,M,S are supported, N is the sequence number log_%Y%m%d.%H%M%S.%N.log
     rotate_name_pattern=log_%Y%m%d.%H%M.log

cpp/wedpr-computing/ppc-cem/tests/data/config.ini

@@ -56,7 +56,7 @@
     max_log_file_size=200
     ; LineID, TimeStamp, ProcessID, ThreadName, ThreadID and Message
     #format=%Severity%|ppcs-psi4ef|system-id|%TimeStamp%|%ThreadName%-%ThreadID%|%Message%
-    #enable_rotate_by_hour=false
+    #enable_rotate_by_hour=true
     #log_name_pattern=ppcs-psi4ef.log
     ; Y,m,d,H,M,S are supported, N is the sequence number log_%Y%m%d.%H%M%S.%N.log
     #rotate_name_pattern=log_%Y%m%d.%H%M.log

cpp/wedpr-helper/ppc-tools/src/config/PPCConfig.cpp

@@ -137,14 +137,14 @@ void PPCConfig::loadFrontConfig(bool requireTransport,
 
     loadEndpointConfig(m_frontConfig->mutableSelfEndPoint(), true, "transport", pt);
     // the gateway targets
-    auto gatewayTargets = pt.get<std::string>("transport.service.gateway_target", "");
+    auto gatewayTargets = pt.get<std::string>("transport.gateway_target", "");
     if (gatewayTargets.empty())
     {
-        BOOST_THROW_EXCEPTION(InvalidConfig() << errinfo_comment(
-                                  "Must specify the transport.service.gateway_target!"));
+        BOOST_THROW_EXCEPTION(
+            InvalidConfig() << errinfo_comment("Must specify the transport.gateway_target!"));
     }
     // the components
-    auto components = pt.get<std::string>("transport.service.components", "");
+    auto components = pt.get<std::string>("transport.components", "");
     boost::split(m_frontConfig->mutableComponents(), components, boost::is_any_of(","));
 }
 

cpp/wedpr-transport/sdk/ProTransportImpl.cpp

@@ -32,23 +32,23 @@ using namespace ppc::sdk;
 ProTransportImpl::ProTransportImpl(ppc::front::FrontConfig::Ptr config, int keepAlivePeriodMs)
   : m_config(std::move(config)), m_keepAlivePeriodMs(keepAlivePeriodMs)
 {
-    // default enable health-check
-    auto grpcServerConfig = std::make_shared<GrpcServerConfig>(config->selfEndPoint(), true);
+    // Note: since the config has been moved away, should not use the `config`, use `m_config`
+    // instead default enable health-check
+    auto grpcServerConfig = std::make_shared<GrpcServerConfig>(m_config->selfEndPoint(), true);
     m_server = std::make_shared<GrpcServer>(grpcServerConfig);
 
     FrontFactory frontFactory;
     m_gateway =
         std::make_shared<GatewayClient>(m_config->grpcConfig(), m_config->gatewayGrpcTarget());
     m_front = frontFactory.build(std::make_shared<NodeInfoFactory>(),
         std::make_shared<MessagePayloadBuilderImpl>(),
-        std::make_shared<MessageOptionalHeaderBuilderImpl>(), m_gateway, config);
+        std::make_shared<MessageOptionalHeaderBuilderImpl>(), m_gateway, m_config);
 
     auto msgBuilder =
         std::make_shared<MessageBuilderImpl>(std::make_shared<MessageHeaderBuilderImpl>());
-    auto frontService = std::make_shared<FrontServer>(msgBuilder, m_front);
-    frontService->setHealthCheckService(m_server->server()->GetHealthCheckService());
+    m_frontService = std::make_shared<FrontServer>(msgBuilder, m_front);
     // register the frontService
-    m_server->registerService(frontService);
+    m_server->registerService(m_frontService);
 }
 
 void ProTransportImpl::start()
@@ -65,6 +65,8 @@ void ProTransportImpl::start()
     });
     m_timer->start();
     m_server->start();
+    // Note: the server is inited after start
+    m_frontService->setHealthCheckService(m_server->server()->GetHealthCheckService());
     m_front->start();
 }
 

cpp/wedpr-transport/sdk/ProTransportImpl.h

@@ -24,7 +24,8 @@
 namespace ppc::protocol
 {
 class GrpcServer;
-}
+class FrontServer;
+}  // namespace ppc::protocol
 
 
 namespace ppc::sdk
@@ -44,6 +45,7 @@ class ProTransportImpl : public Transport, public std::enable_shared_from_this<P
 protected:
     ppc::front::FrontConfig::Ptr m_config;
     std::shared_ptr<ppc::protocol::GrpcServer> m_server;
+    std::shared_ptr<ppc::protocol::FrontServer> m_frontService;
     int m_keepAlivePeriodMs;
     std::shared_ptr<bcos::Timer> m_timer;
 };