Skip to content

Commit 2c8848b

Browse files
committed
fixed:log configure is not work
modify:added file path of log configure
1 parent 3b670de commit 2c8848b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

XEngine_Source/MQCore_ConfigModule/Config_Define.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ typedef struct
3838
}st_XTime;
3939
struct
4040
{
41+
XCHAR tszLOGFile[MAX_PATH];
4142
int nMaxSize;
4243
int nMaxCount;
4344
int nLogLeave;

XEngine_Source/MQCore_ConfigModule/Config_Json/Config_Json.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
9595
Json::Value st_JsonXTime = st_JsonRoot["XTime"];
9696
pSt_ServerConfig->st_XTime.nDBMonth = st_JsonXTime["nDBMonth"].asInt();
9797

98-
if (st_JsonRoot["XLog"].empty() || (3 != st_JsonRoot["XLog"].size()))
98+
if (st_JsonRoot["XLog"].empty() || (4 != st_JsonRoot["XLog"].size()))
9999
{
100100
Config_IsErrorOccur = true;
101101
Config_dwErrorCode = ERROR_MQ_MODULE_CONFIG_JSON_XLOG;
@@ -105,6 +105,7 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile,XENGINE_SERVERCONFIG
105105
pSt_ServerConfig->st_XLog.nMaxSize = st_JsonXLog["MaxSize"].asInt();
106106
pSt_ServerConfig->st_XLog.nMaxCount = st_JsonXLog["MaxCount"].asInt();
107107
pSt_ServerConfig->st_XLog.nLogLeave = st_JsonXLog["LogLeave"].asInt();
108+
_tcsxcpy(pSt_ServerConfig->st_XLog.tszLOGFile, st_JsonXLog["tszLOGFile"].asCString());
108109

109110
if (st_JsonRoot["XSql"].empty() || (4 != st_JsonRoot["XSql"].size()))
110111
{

XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ int main(int argc, char** argv)
107107
memset(&st_XLogConfig, '\0', sizeof(HELPCOMPONENTS_XLOG_CONFIGURE));
108108
memset(&st_ServiceCfg, '\0', sizeof(XENGINE_SERVERCONFIG));
109109

110-
st_XLogConfig.XLog_MaxBackupFile = 10;
111-
st_XLogConfig.XLog_MaxSize = 1024000;
112-
_tcsxcpy(st_XLogConfig.tszFileName, lpszLogFile);
113-
114110
signal(SIGINT, ServiceApp_Stop);
115111
signal(SIGTERM, ServiceApp_Stop);
116112
signal(SIGABRT, ServiceApp_Stop);
@@ -119,6 +115,10 @@ int main(int argc, char** argv)
119115
{
120116
return -1;
121117
}
118+
st_XLogConfig.XLog_MaxBackupFile = st_ServiceCfg.st_XLog.nMaxCount;
119+
st_XLogConfig.XLog_MaxSize = st_ServiceCfg.st_XLog.nMaxSize;
120+
_tcsxcpy(st_XLogConfig.tszFileName, st_ServiceCfg.st_XLog.tszLOGFile);
121+
122122
xhLog = HelpComponents_XLog_Init(HELPCOMPONENTS_XLOG_OUTTYPE_STD | HELPCOMPONENTS_XLOG_OUTTYPE_FILE, &st_XLogConfig);
123123
if (NULL == xhLog)
124124
{

0 commit comments

Comments
 (0)