improved:daemon start name and code location

xengine-qyt · xengine-qyt · commit 03e6315bf0ed · 2025-06-12T11:12:24.000+08:00
diff --git a/XEngine_Release/XEngine_Config/XEngine_CenterConfig.json b/XEngine_Release/XEngine_Config/XEngine_CenterConfig.json
@@ -1,6 +1,6 @@
 {
     "tszIPAddr": "127.0.0.1",
-    "bDeamon": 0,
+    "bDaemon": 0,
     "nPort": 5000,
     "XMax": {
         "nMaxClient": 10000,
diff --git a/XEngine_Release/XEngine_Config/XEngine_Http2Config.json b/XEngine_Release/XEngine_Config/XEngine_Http2Config.json
@@ -1,6 +1,6 @@
 {
     "tszIPAddr": "127.0.0.1",
-    "bDeamon": 0,
+    "bDaemon": 0,
     "nPort": 5002,
     "XMax": {
         "nMaxClient": 10000,
diff --git a/XEngine_Release/XEngine_Config/XEngine_HttpConfig.json b/XEngine_Release/XEngine_Config/XEngine_HttpConfig.json
@@ -1,6 +1,6 @@
 {
     "tszIPAddr": "127.0.0.1",
-    "bDeamon": 0,
+    "bDaemon": 0,
     "nPort": 5001,
     "XMax": {
         "nMaxClient": 10000,
diff --git a/XEngine_Release/XEngine_Config/XEngine_WSConfig.json b/XEngine_Release/XEngine_Config/XEngine_WSConfig.json
@@ -1,6 +1,6 @@
 {
     "tszIPAddr": "127.0.0.1",
-    "bDeamon": 0,
+    "bDaemon": 0,
     "nPort": 5003,
     "XMax": {
         "nMaxClient": 10000,
diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h
@@ -16,7 +16,7 @@
 typedef struct tag_XEngine_ServiceConfig
 {
 	XCHAR tszIPAddr[128];                     //本机IP地址,根据需要配置
-	bool bDeamon;                             //是否以守护进程启动,LINUX有效
+	bool bDaemon;                             //是否以守护进程启动,LINUX有效
 	int nPort;                                //服务
 	struct
 	{
diff --git a/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp
@@ -82,7 +82,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 		return false;
 	}
 	_tcsxcpy(pSt_ServerConfig->tszIPAddr, st_JsonRoot["tszIPAddr"].asCString());
-	pSt_ServerConfig->bDeamon = st_JsonRoot["bDeamon"].asInt();
+	pSt_ServerConfig->bDaemon = st_JsonRoot["bDaemon"].asInt();
 	pSt_ServerConfig->nPort = st_JsonRoot["nPort"].asInt();
 	//最大配置
 	if (st_JsonRoot["XMax"].empty() || (4 != st_JsonRoot["XMax"].size()))
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_CenterApp.cpp
@@ -96,11 +96,6 @@ int main(int argc, char** argv)
 	{
 		return -1;
 	}
-	//判断是否以守护进程启动
-	if (st_ServiceConfig.bDeamon)
-	{
-		ServiceApp_Deamon();
-	}
 	st_XLogConfig.XLog_MaxBackupFile = st_ServiceConfig.st_XLog.nMaxCount;
 	st_XLogConfig.XLog_MaxSize = st_ServiceConfig.st_XLog.nMaxSize;
 	_tcsxcpy(st_XLogConfig.tszFileName, st_ServiceConfig.st_XLog.tszLogFile);
@@ -114,12 +109,16 @@ int main(int argc, char** argv)
 	//设置日志打印级别
 	HelpComponents_XLog_SetLogPriority(xhLog, st_ServiceConfig.st_XLog.nLogLeave);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化日志系统成功"));
-
 	signal(SIGINT, ServiceApp_Stop);
 	signal(SIGTERM, ServiceApp_Stop);
 	signal(SIGABRT, ServiceApp_Stop);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化信号量成功"));
-
+	//判断是否以守护进程启动
+	if (st_ServiceConfig.bDaemon)
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，使用守护进程启动服务..."));
+		ServiceApp_Deamon();
+	}
 	//启动业务服务相关代码
 	if (st_ServiceConfig.nPort > 0)
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_Configure.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_CenterApp/XEngine_Configure.cpp
@@ -29,7 +29,7 @@ bool XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS
 		}
 		else if (0 == _tcsxcmp("-d", argv[i]))
 		{
-			pSt_Configure->bDeamon = _ttxoi(argv[i + 1]);
+			pSt_Configure->bDaemon = _ttxoi(argv[i + 1]);
 		}
 		else if (0 == _tcsxcmp("-t", argv[i]))
 		{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_Configure.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_Configure.cpp
@@ -29,7 +29,7 @@ bool XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS
 		}
 		else if (0 == _tcsxcmp("-d", argv[i]))
 		{
-			pSt_Configure->bDeamon = _ttxoi(argv[i + 1]);
+			pSt_Configure->bDaemon = _ttxoi(argv[i + 1]);
 		}
 		else if (0 == _tcsxcmp("-t", argv[i]))
 		{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HTTP2App/XEngine_HTTP2App.cpp
@@ -97,11 +97,6 @@ int main(int argc, char** argv)
 	{
 		return -1;
 	}
-	//判断是否以守护进程启动
-	if (st_ServiceConfig.bDeamon)
-	{
-		ServiceApp_Deamon();
-	}
 	st_XLogConfig.XLog_MaxBackupFile = st_ServiceConfig.st_XLog.nMaxCount;
 	st_XLogConfig.XLog_MaxSize = st_ServiceConfig.st_XLog.nMaxSize;
 	_tcsxcpy(st_XLogConfig.tszFileName, st_ServiceConfig.st_XLog.tszLogFile);
@@ -120,6 +115,12 @@ int main(int argc, char** argv)
 	signal(SIGTERM, ServiceApp_Stop);
 	signal(SIGABRT, ServiceApp_Stop);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化信号量成功"));
+	//判断是否以守护进程启动
+	if (st_ServiceConfig.bDaemon)
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，使用守护进程启动服务..."));
+		ServiceApp_Deamon();
+	}
 	//启动HTTP服务相关代码
 	if (!HttpProtocol_ServerConfig_InitMime(lpszHTTPMime, false, false))
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Configure.cpp
@@ -29,7 +29,7 @@ bool XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS
 		}
 		else if (0 == _tcsxcmp("-d", argv[i]))
 		{
-			pSt_Configure->bDeamon = _ttxoi(argv[i + 1]);
+			pSt_Configure->bDaemon = _ttxoi(argv[i + 1]);
 		}
 		else if (0 == _tcsxcmp("-t", argv[i]))
 		{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp
@@ -98,11 +98,6 @@ int main(int argc, char** argv)
 	{
 		return -1;
 	}
-	//判断是否以守护进程启动
-	if (st_ServiceConfig.bDeamon)
-	{
-		ServiceApp_Deamon();
-	}
 	st_XLogConfig.XLog_MaxBackupFile = st_ServiceConfig.st_XLog.nMaxCount;
 	st_XLogConfig.XLog_MaxSize = st_ServiceConfig.st_XLog.nMaxSize;
 	_tcsxcpy(st_XLogConfig.tszFileName, st_ServiceConfig.st_XLog.tszLogFile);
@@ -121,6 +116,12 @@ int main(int argc, char** argv)
 	signal(SIGTERM, ServiceApp_Stop);
 	signal(SIGABRT, ServiceApp_Stop);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化信号量成功"));
+	//判断是否以守护进程启动
+	if (st_ServiceConfig.bDaemon)
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，使用守护进程启动服务..."));
+		ServiceApp_Deamon();
+	}
 	//启动HTTP服务相关代码
 	if (st_ServiceConfig.nPort > 0)
 	{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_Configure.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_Configure.cpp
@@ -29,7 +29,7 @@ bool XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS
 		}
 		else if (0 == _tcsxcmp("-d", argv[i]))
 		{
-			pSt_Configure->bDeamon = _ttxoi(argv[i + 1]);
+			pSt_Configure->bDaemon = _ttxoi(argv[i + 1]);
 		}
 		else if (0 == _tcsxcmp("-t", argv[i]))
 		{
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WebSocketApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_WebSocketApp/XEngine_WebSocketApp.cpp
@@ -96,11 +96,6 @@ int main(int argc, char** argv)
 	{
 		return -1;
 	}
-	//判断是否以守护进程启动
-	if (st_ServiceConfig.bDeamon)
-	{
-		ServiceApp_Deamon();
-	}
 	st_XLogConfig.XLog_MaxBackupFile = st_ServiceConfig.st_XLog.nMaxCount;
 	st_XLogConfig.XLog_MaxSize = st_ServiceConfig.st_XLog.nMaxSize;
 	_tcsxcpy(st_XLogConfig.tszFileName, st_ServiceConfig.st_XLog.tszLogFile);
@@ -119,6 +114,12 @@ int main(int argc, char** argv)
 	signal(SIGTERM, ServiceApp_Stop);
 	signal(SIGABRT, ServiceApp_Stop);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化信号量成功"));
+	//判断是否以守护进程启动
+	if (st_ServiceConfig.bDaemon)
+	{
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，使用守护进程启动服务..."));
+		ServiceApp_Deamon();
+	}
 	//WEBSOCKET包处理器
 	xhWSPacket = RfcComponents_WSPacket_InitEx(st_ServiceConfig.st_XMax.nThread);
 	if (NULL == xhWSPacket)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"tszIPAddr": "127.0.0.1",`
`3`		`- "bDeamon": 0,`
	`3`	`+ "bDaemon": 0,`
`4`	`4`	`"nPort": 5000,`
`5`	`5`	`"XMax": {`
`6`	`6`	`"nMaxClient": 10000,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`typedef struct tag_XEngine_ServiceConfig`
`17`	`17`	`{`
`18`	`18`	`XCHAR tszIPAddr[128]; //本机IP地址,根据需要配置`
`19`		`- bool bDeamon; //是否以守护进程启动,LINUX有效`
	`19`	`+ bool bDaemon; //是否以守护进程启动,LINUX有效`
`20`	`20`	`int nPort; //服务`
`21`	`21`	`struct`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`	`_tcsxcpy(pSt_ServerConfig->tszIPAddr, st_JsonRoot["tszIPAddr"].asCString());`
`85`		`- pSt_ServerConfig->bDeamon = st_JsonRoot["bDeamon"].asInt();`
	`85`	`+ pSt_ServerConfig->bDaemon = st_JsonRoot["bDaemon"].asInt();`
`86`	`86`	`pSt_ServerConfig->nPort = st_JsonRoot["nPort"].asInt();`
`87`	`87`	`//最大配置`
`88`	`88`	`if (st_JsonRoot["XMax"].empty() \|\| (4 != st_JsonRoot["XMax"].size()))`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ bool XEngine_Configure_Parament(int argc, char** argv, XENGINE_SERVICECONFIG* pS`
`29`	`29`	`}`
`30`	`30`	`else if (0 == _tcsxcmp("-d", argv[i]))`
`31`	`31`	`{`
`32`		`- pSt_Configure->bDeamon = _ttxoi(argv[i + 1]);`
	`32`	`+ pSt_Configure->bDaemon = _ttxoi(argv[i + 1]);`
`33`	`33`	`}`
`34`	`34`	`else if (0 == _tcsxcmp("-t", argv[i]))`
`35`	`35`	`{`