delete:not retry when start process failed

Author: xengine-qyt

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -33,7 +33,6 @@ typedef struct
 		int nTimeCheck;                       //检测次数
 		int nHTTPTimeOut;                     //HTTP超时时间
 		int nP2PTimeOut;                      //P2P客户端超时时间
-		int nDeamonTime;                      //进程守护失败执行次数
 	}st_XTime;                                //次数*时间=超时
 	struct
 	{

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -100,7 +100,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XMax.nIOThread = st_JsonXMax["nIOThread"].asInt();
 	pSt_ServerConfig->st_XMax.nHTTPThread = st_JsonXMax["nHttpThread"].asInt();
 
-	if (st_JsonRoot["XTime"].empty() || (4 != st_JsonRoot["XTime"].size()))
+	if (st_JsonRoot["XTime"].empty() || (3 != st_JsonRoot["XTime"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XTIME;
@@ -110,7 +110,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XTime.nTimeCheck = st_JsonXTime["nTimeCheck"].asInt();
 	pSt_ServerConfig->st_XTime.nHTTPTimeOut = st_JsonXTime["nHttpTimeOut"].asInt();
 	pSt_ServerConfig->st_XTime.nP2PTimeOut = st_JsonXTime["nP2PTimeOut"].asInt();
-	pSt_ServerConfig->st_XTime.nDeamonTime = st_JsonXTime["nDeamonTime"].asInt();
 
 	if (st_JsonRoot["XLog"].empty() || (4 != st_JsonRoot["XLog"].size()))
 	{
@@ -544,6 +543,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_DeamonList(LPCXSTR lpszConfigFi
 		strcpy(st_APPInfo.tszAPPPath, st_JsonArray[i]["tszAPPPath"].asCString());
 		st_APPInfo.bEnable = st_JsonArray[i]["bEnable"].asBool();
 		st_APPInfo.nReTime = st_JsonArray[i]["nAPPReTime"].asInt();
+		st_APPInfo.nReNumber = st_JsonArray[i]["nAPPReNumber"].asInt();
 
 		pSt_AppConfig->stl_ListDeamonApp.push_back(st_APPInfo);
 	}

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_TaskPost/TaskPost_Deamon.cpp

@@ -12,17 +12,10 @@ void CALLBACK HTTPTask_TaskPost_Thread()
 			{
 				continue;
 			}
-			//重试次数判断
-			if (stl_ListIterator->nErrorTime > st_ServiceConfig.st_XTime.nDeamonTime)
-			{
-				stl_ListIterator->bEnable = false;
-				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("服务名：%s，由于超过指定启动失败次数：%d，这个服务检测功能被关闭..."), stl_ListIterator->tszAPPName, st_ServiceConfig.st_XTime.nDeamonTime);
-				continue;
-			}
 			if (stl_ListIterator->nErrorTime >= stl_ListIterator->nReNumber)
 			{
 				stl_ListIterator->bEnable = false;
-				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("服务名：%s，由于超过指定启动失败次数：%d，这个服务检测功能被关闭..."), stl_ListIterator->tszAPPName, st_ServiceConfig.st_XTime.nDeamonTime);
+				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("服务名：%s，由于超过指定启动失败次数：%d，这个服务检测功能被关闭..."), stl_ListIterator->tszAPPName, stl_ListIterator->nReNumber);
 				continue;
 			}
 
@@ -46,7 +39,8 @@ void CALLBACK HTTPTask_TaskPost_Thread()
 					}
 					else
 					{
-						XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("自动重启,重启进程：%s 失败，错误码：%lX..."), stl_ListIterator->tszAPPName, SystemApi_GetLastError());
+						stl_ListIterator->bEnable = false;
+						XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("自动重启,重启进程：%s 失败,此服务将被禁用，错误码：%lX..."), stl_ListIterator->tszAPPName, SystemApi_GetLastError());
 					}
 					stl_ListIterator->nErrorTime++;
 				}
@@ -84,7 +78,8 @@ void CALLBACK HTTPTask_TaskPost_Thread()
 			    }
 				else
 				{
-					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, "崩溃重启,检查到进程不存在,启动进程：%s 失败，错误码：%lX...", stl_ListIterator->tszAPPName, SystemApi_GetLastError());
+					stl_ListIterator->bEnable = false;
+					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, "崩溃重启,检查到进程不存在,启动进程：%s 失败,此服务将被禁用，错误码：%lX...", stl_ListIterator->tszAPPName, SystemApi_GetLastError());
 				}
 				stl_ListIterator->nErrorTime++;
 			}