fix change tarsnode start server timeout default time(60000)

TarsCloud · Oct 27, 2023 · f966581 · f966581
1 parent 7af5791
commit f966581
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/NodeServer/CommandLoad.cpp b/NodeServer/CommandLoad.cpp
@@ -535,8 +535,8 @@ int CommandLoad::updateConfigFile(string& sResult)
         _serverObjectPtr->setMainClass(tConf.get("/tars/application/server<mainclass>", ""));
         _serverObjectPtr->setClassPath(tConf.get("/tars/application/server<classpath>", ""));
         _serverObjectPtr->setEnv(tConf.get("/tars/application/server<env>", ""));
-        _serverObjectPtr->setHeartTimeout(TC_Common::strto<int>(tConf.get("/tars/application/server<hearttimeout>", "")));
-        _serverObjectPtr->setActivatingTimeout(TC_Common::strto<int>(tConf.get("/tars/application/server<activating-timeout>", "")));
+        _serverObjectPtr->setHeartTimeout(TC_Common::strto<int>(tConf.get("/tars/application/server<hearttimeout>", "45000")));
+        _serverObjectPtr->setActivatingTimeout(TC_Common::strto<int>(tConf.get("/tars/application/server<activating-timeout>", "60000")));
         _serverObjectPtr->setPackageFormat(tConf.get("/tars/application/server<packageFormat>", "tgz"));
 
 		_serverObjectPtr->setVolumes(tConf.getDomainMap("/tars/application/container/volumes"));

diff --git a/NodeServer/ServerObject.cpp b/NodeServer/ServerObject.cpp
@@ -612,7 +612,7 @@ bool ServerObject::isStartTimeOut()
 	Lock lock(*this);
 	int64_t now = TNOWMS;
 
-	int timeout=_activatingTimeout >0 ? _activatingTimeout : 11000;
+	int timeout=_activatingTimeout >0 ? _activatingTimeout : 30000;
 
 	if (now - _startTime >= timeout && now - _keepAliveTime >= timeout)
 	{