fix log caused exit coredump

cyjseagull · cyjseagull · commit 1adc00fbbc19 · 2024-11-11T22:06:35.000+08:00
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/bindings/conf/wedpr_sdk_log_config.ini b/cpp/wedpr-transport/sdk-wrapper/java/bindings/conf/wedpr_sdk_log_config.ini
@@ -0,0 +1,9 @@
+[log]
+    enable=true
+    ; print the log to std::cout or not, default print to the log files
+    enable_console_output = false
+    log_path=./log
+    ; info debug trace
+    level=info
+    ; MB
+    max_log_file_size=200
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/generated/TransportBuilder.java b/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/generated/TransportBuilder.java
@@ -71,7 +71,7 @@ public SWIGTYPE_p_std__shared_ptrT_ppc__front__FrontConfigBuilder_t frontConfigB
                 wedpr_java_transportJNI.TransportBuilder_frontConfigBuilder(swigCPtr, this), false);
     }
 
-    public static void initLog(String configPath) {
-        wedpr_java_transportJNI.TransportBuilder_initLog(configPath);
+    public void initLog(String configPath) {
+        wedpr_java_transportJNI.TransportBuilder_initLog(swigCPtr, this, configPath);
     }
 }
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/generated/wedpr_java_transportJNI.java b/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/generated/wedpr_java_transportJNI.java
@@ -875,7 +875,8 @@ public static final native long TransportBuilder_buildConfig(
     public static final native long TransportBuilder_frontConfigBuilder(
             long jarg1, TransportBuilder jarg1_);
 
-    public static final native void TransportBuilder_initLog(String jarg1);
+    public static final native void TransportBuilder_initLog(
+            long jarg1, TransportBuilder jarg1_, String jarg2);
 
     public static final native long new_Transport(long jarg1, FrontConfig jarg1_);
 
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/transport/TransportConfig.java b/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/transport/TransportConfig.java
@@ -40,10 +40,13 @@ public class TransportConfig {
     }
 
     private static synchronized void createTransportBuilder() {
-        // TODO: make log path configuration here
-        TransportBuilder.initLog("conf/wedpr_sdk_log_config.ini");
+        if (transportBuilder != null) {
+            logger.info("transportBuilder has already been created");
+            return;
+        }
         logger.info("init transportBuilder");
         transportBuilder = new TransportBuilder();
+        transportBuilder.initLog("conf/wedpr_sdk_log_config.ini");
         logger.info("init transportBuilder success");
     }
 
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/transport/impl/TransportImpl.java b/cpp/wedpr-transport/sdk-wrapper/java/bindings/src/main/java/com/webank/wedpr/sdk/jni/transport/impl/TransportImpl.java
@@ -74,6 +74,9 @@ public void start() {
             this.transport.start();
         } catch (Exception e) {
             logger.warn("start the transport failed, error: ", e);
+            if (this.transport != null) {
+                this.transport.stop();
+            }
             throw e;
         }
     }
diff --git a/cpp/wedpr-transport/sdk-wrapper/java/src/wedpr_java_transportJAVA_wrap.cxx b/cpp/wedpr-transport/sdk-wrapper/java/src/wedpr_java_transportJAVA_wrap.cxx
@@ -10161,23 +10161,26 @@ SWIGEXPORT jlong JNICALL Java_com_webank_wedpr_sdk_jni_generated_wedpr_1java_1tr
 }
 
 
-SWIGEXPORT void JNICALL Java_com_webank_wedpr_sdk_jni_generated_wedpr_1java_1transportJNI_TransportBuilder_1initLog(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  std::string *arg1 = 0 ;
+SWIGEXPORT void JNICALL Java_com_webank_wedpr_sdk_jni_generated_wedpr_1java_1transportJNI_TransportBuilder_1initLog(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) {
+  ppc::sdk::TransportBuilder *arg1 = (ppc::sdk::TransportBuilder *) 0 ;
+  std::string *arg2 = 0 ;
   
   (void)jenv;
   (void)jcls;
-  if(!jarg1) {
+  (void)jarg1_;
+  arg1 = *(ppc::sdk::TransportBuilder **)&jarg1; 
+  if(!jarg2) {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
     return ;
   }
-  const char *arg1_pstr = (const char *)jenv->GetStringUTFChars(jarg1, 0); 
-  if (!arg1_pstr) return ;
-  std::string arg1_str(arg1_pstr);
-  arg1 = &arg1_str;
-  jenv->ReleaseStringUTFChars(jarg1, arg1_pstr); 
+  const char *arg2_pstr = (const char *)jenv->GetStringUTFChars(jarg2, 0); 
+  if (!arg2_pstr) return ;
+  std::string arg2_str(arg2_pstr);
+  arg2 = &arg2_str;
+  jenv->ReleaseStringUTFChars(jarg2, arg2_pstr); 
   {
     try {
-      ppc::sdk::TransportBuilder::initLog((std::string const &)*arg1);
+      (arg1)->initLog((std::string const &)*arg2);
     }
     catch (const std::exception& e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, std::string(boost::diagnostic_information(e)).c_str());
diff --git a/cpp/wedpr-transport/sdk-wrapper/python/bindings/wedpr_python_gateway_sdk/transport/generated/wedpr_python_transport.py b/cpp/wedpr-transport/sdk-wrapper/python/bindings/wedpr_python_gateway_sdk/transport/generated/wedpr_python_transport.py
@@ -1820,9 +1820,8 @@ def buildConfig(self, threadPoolSize, nodeID):
     def frontConfigBuilder(self):
         return _wedpr_python_transport.TransportBuilder_frontConfigBuilder(self)
 
-    @staticmethod
-    def initLog(configPath):
-        return _wedpr_python_transport.TransportBuilder_initLog(configPath)
+    def initLog(self, configPath):
+        return _wedpr_python_transport.TransportBuilder_initLog(self, configPath)
 
 
 # Register TransportBuilder in _wedpr_python_transport:
diff --git a/cpp/wedpr-transport/sdk-wrapper/python/src/wedpr_python_transportPYTHON_wrap.cxx b/cpp/wedpr-transport/sdk-wrapper/python/src/wedpr_python_transportPYTHON_wrap.cxx
@@ -25934,30 +25934,37 @@ SWIGINTERN PyObject *_wrap_TransportBuilder_frontConfigBuilder(PyObject *self, P
 
 SWIGINTERN PyObject *_wrap_TransportBuilder_initLog(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  std::string *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  PyObject *swig_obj[1] ;
+  ppc::sdk::TransportBuilder *arg1 = (ppc::sdk::TransportBuilder *) 0 ;
+  std::string *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  PyObject *swig_obj[2] ;
   
   (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
+  if (!SWIG_Python_UnpackTuple(args, "TransportBuilder_initLog", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ppc__sdk__TransportBuilder, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TransportBuilder_initLog" "', argument " "1"" of type '" "ppc::sdk::TransportBuilder *""'"); 
+  }
+  arg1 = reinterpret_cast< ppc::sdk::TransportBuilder * >(argp1);
   {
     std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TransportBuilder_initLog" "', argument " "1"" of type '" "std::string const &""'"); 
+    res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TransportBuilder_initLog" "', argument " "2"" of type '" "std::string const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TransportBuilder_initLog" "', argument " "1"" of type '" "std::string const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TransportBuilder_initLog" "', argument " "2"" of type '" "std::string const &""'"); 
     }
-    arg1 = ptr;
+    arg2 = ptr;
   }
-  ppc::sdk::TransportBuilder::initLog((std::string const &)*arg1);
+  (arg1)->initLog((std::string const &)*arg2);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res1)) delete arg1;
+  if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
+  if (SWIG_IsNewObj(res2)) delete arg2;
   return NULL;
 }
 
@@ -27417,7 +27424,7 @@ static PyMethodDef SwigMethods[] = {
 	 { "TransportBuilder_buildProTransport", _wrap_TransportBuilder_buildProTransport, METH_VARARGS, NULL},
 	 { "TransportBuilder_buildConfig", _wrap_TransportBuilder_buildConfig, METH_VARARGS, NULL},
 	 { "TransportBuilder_frontConfigBuilder", _wrap_TransportBuilder_frontConfigBuilder, METH_O, NULL},
-	 { "TransportBuilder_initLog", _wrap_TransportBuilder_initLog, METH_O, NULL},
+	 { "TransportBuilder_initLog", _wrap_TransportBuilder_initLog, METH_VARARGS, NULL},
 	 { "TransportBuilder_swigregister", TransportBuilder_swigregister, METH_O, NULL},
 	 { "TransportBuilder_swiginit", TransportBuilder_swiginit, METH_VARARGS, NULL},
 	 { "new_Transport", _wrap_new_Transport, METH_O, NULL},
diff --git a/cpp/wedpr-transport/sdk/src/ProTransportImpl.cpp b/cpp/wedpr-transport/sdk/src/ProTransportImpl.cpp
@@ -48,6 +48,13 @@ ProTransportImpl::ProTransportImpl(ppc::front::FrontConfig::Ptr config, int keep
     m_server->registerService(m_frontService);
 }
 
+ProTransportImpl::~ProTransportImpl()
+{
+    TRANSPORT_LOG(INFO) << LOG_DESC("stop pro transport");
+    stop();
+    TRANSPORT_LOG(INFO) << LOG_DESC("stop pro transport success");
+}
+
 void ProTransportImpl::start()
 {
     m_timer = std::make_shared<bcos::Timer>(m_keepAlivePeriodMs, "frontKeepAlive");
diff --git a/cpp/wedpr-transport/sdk/src/ProTransportImpl.h b/cpp/wedpr-transport/sdk/src/ProTransportImpl.h
@@ -36,7 +36,7 @@ class ProTransportImpl : public Transport, public std::enable_shared_from_this<P
 public:
     using Ptr = std::shared_ptr<ProTransportImpl>;
     ProTransportImpl(ppc::front::FrontConfig::Ptr config, int keepAlivePeriodMs = 3000);
-
+    ~ProTransportImpl();
     void start() override;
     void stop() override;
 
diff --git a/cpp/wedpr-transport/sdk/src/TransportBuilder.cpp b/cpp/wedpr-transport/sdk/src/TransportBuilder.cpp
@@ -29,9 +29,6 @@
 using namespace ppc::sdk;
 using namespace ppc::front;
 
-bcos::BoostLogInitializer::Ptr TransportBuilder::g_logInitializer;
-std::once_flag TransportBuilder::g_flag;
-
 TransportBuilder::TransportBuilder()
 {
     m_frontConfigBuilder = std::make_shared<FrontConfigBuilderImpl>(
@@ -60,3 +57,27 @@ ppc::front::FrontConfig::Ptr TransportBuilder::buildConfig(int threadPoolSize, s
 {
     return m_frontConfigBuilder->build(threadPoolSize, nodeID);
 }
+
+
+void TransportBuilder::initLog(const std::string& configPath)
+{
+    bcos::Guard l(x_logInited);
+    if (m_logInited)
+    {
+        return;
+    }
+    m_logInited = true;
+    // init the log
+    boost::property_tree::ptree pt;
+    try
+    {
+        boost::property_tree::read_ini(configPath, pt);
+    }
+    catch (std::exception const& e)
+    {
+        // disable the log when the configPath not exists
+        pt.put("log.enable", false);
+    }
+    m_logInitializer = std::make_shared<bcos::BoostLogInitializer>();
+    m_logInitializer->initLog(pt, bcos::FileLogger, "gateway_sdk_log");
+}
diff --git a/cpp/wedpr-transport/sdk/src/TransportBuilder.h b/cpp/wedpr-transport/sdk/src/TransportBuilder.h
@@ -51,30 +51,12 @@ class TransportBuilder
     ppc::front::FrontConfigBuilder::Ptr const& frontConfigBuilder() { return m_frontConfigBuilder; }
 
 
-    static void initLog(const std::string& configPath)
-    {
-        std::call_once(g_flag, [configPath]() {
-            // init the log
-            boost::property_tree::ptree pt;
-            try
-            {
-                boost::property_tree::read_ini(configPath, pt);
-            }
-            catch (std::exception const& e)
-            {
-                // disable the log when the configPath not exists
-                pt.put("log.enable", false);
-            }
-
-            g_logInitializer = std::make_shared<bcos::BoostLogInitializer>();
-            g_logInitializer->initLog(pt, bcos::FileLogger, "gateway_sdk_log");
-        });
-    }
+    void initLog(const std::string& configPath);
 
 private:
     ppc::front::FrontConfigBuilder::Ptr m_frontConfigBuilder;
-
-    static std::once_flag g_flag;
-    static bcos::BoostLogInitializer::Ptr g_logInitializer;
+    bcos::BoostLogInitializer::Ptr m_logInitializer;
+    bool m_logInited = false;
+    bcos::Mutex x_logInited;
 };
 }  // namespace ppc::sdk

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public SWIGTYPE_p_std__shared_ptrT_ppc__front__FrontConfigBuilder_t frontConfigB`
`71`	`71`	`wedpr_java_transportJNI.TransportBuilder_frontConfigBuilder(swigCPtr, this), false);`
`72`	`72`	`}`
`73`	`73`
`74`		`- public static void initLog(String configPath) {`
`75`		`- wedpr_java_transportJNI.TransportBuilder_initLog(configPath);`
	`74`	`+ public void initLog(String configPath) {`
	`75`	`+ wedpr_java_transportJNI.TransportBuilder_initLog(swigCPtr, this, configPath);`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,13 @@ public class TransportConfig {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private static synchronized void createTransportBuilder() {`
`43`		`- // TODO: make log path configuration here`
`44`		`- TransportBuilder.initLog("conf/wedpr_sdk_log_config.ini");`
	`43`	`+ if (transportBuilder != null) {`
	`44`	`+ logger.info("transportBuilder has already been created");`
	`45`	`+ return;`
	`46`	`+ }`
`45`	`47`	`logger.info("init transportBuilder");`
`46`	`48`	`transportBuilder = new TransportBuilder();`
	`49`	`+ transportBuilder.initLog("conf/wedpr_sdk_log_config.ini");`
`47`	`50`	`logger.info("init transportBuilder success");`
`48`	`51`	`}`
`49`	`52`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ public void start() {`
`74`	`74`	`this.transport.start();`
`75`	`75`	`} catch (Exception e) {`
`76`	`76`	`logger.warn("start the transport failed, error: ", e);`
	`77`	`+ if (this.transport != null) {`
	`78`	`+ this.transport.stop();`
	`79`	`+ }`
`77`	`80`	`throw e;`
`78`	`81`	`}`
`79`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,13 @@ ProTransportImpl::ProTransportImpl(ppc::front::FrontConfig::Ptr config, int keep`
`48`	`48`	`m_server->registerService(m_frontService);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ProTransportImpl::~ProTransportImpl()`
	`52`	`+{`
	`53`	`+ TRANSPORT_LOG(INFO) << LOG_DESC("stop pro transport");`
	`54`	`+ stop();`
	`55`	`+ TRANSPORT_LOG(INFO) << LOG_DESC("stop pro transport success");`
	`56`	`+}`
	`57`	`+`
`51`	`58`	`void ProTransportImpl::start()`
`52`	`59`	`{`
`53`	`60`	`m_timer = std::make_shared<bcos::Timer>(m_keepAlivePeriodMs, "frontKeepAlive");`