Skip to content

Commit b219b52

Browse files
committed
added:info report supported
1 parent c9e4812 commit b219b52

File tree

6 files changed

+43
-1
lines changed

6 files changed

+43
-1
lines changed

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ typedef struct
9595
bool bDeamon;
9696
}st_VerSwitch;
9797
}st_XVerifcation;
98+
struct
99+
{
100+
bool bEnable;
101+
XCHAR tszAPIUrl[MAX_PATH];
102+
XCHAR tszServiceName[128];
103+
}st_XReport;
98104
struct
99105
{
100106
list<string>* pStl_ListVer;

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Error.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define ERROR_MODULE_CONFIGURE_JSON_XCONFIG 0xA000C //配置文件配置加载失败
2525
#define ERROR_MODULE_CONFIGURE_JSON_XSLINK 0xA000D //短连接配置错误
2626
#define ERROR_MODULE_CONFIGURE_JSON_XVERICATION 0xA000E //验证配置错误
27+
#define ERROR_MODULE_CONFIGURE_JSON_XREPORT 0xA000F //报告配置错误
2728
//////////////////////////////////////////////////////////////////////////
2829
#define ERROR_MODULE_CONFIGURE_FILE_PARAMENT 0xA1001 //参数错误
2930
#define ERROR_MODULE_CONFIGURE_FILE_OPENFILE 0xA1002 //打开文件失败

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,18 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
199199
Json::Value st_JsonVerSwitch = st_JsonXVerifcation["st_VerSwitch"];
200200
pSt_ServerConfig->st_XVerifcation.st_VerSwitch.bBackService = st_JsonVerSwitch["bBackService"].asBool();
201201
pSt_ServerConfig->st_XVerifcation.st_VerSwitch.bDeamon = st_JsonVerSwitch["bDeamon"].asBool();
202+
203+
if (st_JsonRoot["XReport"].empty() || (3 != st_JsonRoot["XReport"].size()))
204+
{
205+
Config_IsErrorOccur = true;
206+
Config_dwErrorCode = ERROR_MODULE_CONFIGURE_JSON_XREPORT;
207+
return false;
208+
}
209+
Json::Value st_JsonXReport = st_JsonRoot["XReport"];
210+
211+
pSt_ServerConfig->st_XReport.bEnable = st_JsonXReport["bEnable"].asBool();
212+
_tcsxcpy(pSt_ServerConfig->st_XReport.tszAPIUrl, st_JsonXReport["tszAPIUrl"].asCString());
213+
_tcsxcpy(pSt_ServerConfig->st_XReport.tszServiceName, st_JsonXReport["tszServiceName"].asCString());
202214
return true;
203215
}
204216
/********************************************************************

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_Hdr.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ using namespace std;
5353
#include <XEngine_Include/XEngine_AVCodec/AudioCodec_Error.h>
5454
#include <XEngine_Include/XEngine_AVCodec/AVHelp_Define.h>
5555
#include <XEngine_Include/XEngine_AVCodec/AVHelp_Error.h>
56+
#include "../../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Define.h"
57+
#include "../../XEngine_Depend/XEngine_Module/XEngine_InfoReport/InfoReport_Error.h"
5658
//加载项目相关头文件
5759
#include "../../XEngine_BuildSwitch.h"
5860
#include "../../XEngine_UserProtocol.h"
@@ -129,13 +131,15 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
129131
#ifdef _MSC_BUILD
130132
#ifdef _WIN64
131133
#ifdef _DEBUG
134+
#pragma comment(lib,"../../x64/Debug/XEngine_InfoReport.lib")
132135
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleConfigure.lib")
133136
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleDatabase.lib")
134137
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleProtocol.lib")
135138
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleSystem.lib")
136139
#pragma comment(lib,"../../x64/Debug/XEngine_ModuleHelp.lib")
137140
#pragma comment(lib,"../../x64/Debug/XEngine_ModulePlugin.lib")
138141
#else
142+
#pragma comment(lib,"../../x64/Release/XEngine_InfoReport.lib")
139143
#pragma comment(lib,"../../x64/Release/XEngine_ModuleConfigure.lib")
140144
#pragma comment(lib,"../../x64/Release/XEngine_ModuleDatabase.lib")
141145
#pragma comment(lib,"../../x64/Release/XEngine_ModuleProtocol.lib")
@@ -145,13 +149,15 @@ extern XENGINE_DEAMONAPPLIST st_DeamonAppConfig;
145149
#endif
146150
#else
147151
#ifdef _DEBUG
152+
#pragma comment(lib,"../../Debug/XEngine_InfoReport.lib")
148153
#pragma comment(lib,"../../Debug/XEngine_ModuleConfigure.lib")
149154
#pragma comment(lib,"../../Debug/XEngine_ModuleDatabase.lib")
150155
#pragma comment(lib,"../../Debug/XEngine_ModuleProtocol.lib")
151156
#pragma comment(lib,"../../Debug/XEngine_ModuleSystem.lib")
152157
#pragma comment(lib,"../../Debug/XEngine_ModuleHelp.lib")
153158
#pragma comment(lib,"../../Debug/XEngine_ModulePlugin.lib")
154159
#else
160+
#pragma comment(lib,"../../Release/XEngine_InfoReport.lib")
155161
#pragma comment(lib,"../../Release/XEngine_ModuleConfigure.lib")
156162
#pragma comment(lib,"../../Release/XEngine_ModuleDatabase.lib")
157163
#pragma comment(lib,"../../Release/XEngine_ModuleProtocol.lib")

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,23 @@ int main(int argc, char** argv)
427427
//展示能力
428428
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,加载的Lib插件:%d 个,Lua插件:%d 个"), st_PluginLibConfig.pStl_ListPlugin->size(), st_PluginLuaConfig.pStl_ListPlugin->size());
429429

430+
//发送信息报告
431+
if (st_ServiceConfig.st_XReport.bEnable)
432+
{
433+
if (InfoReport_APIMachine_Send(st_ServiceConfig.st_XReport.tszAPIUrl, st_ServiceConfig.st_XReport.tszServiceName))
434+
{
435+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动信息报告给API服务器:%s 成功"), st_ServiceConfig.st_XReport.tszAPIUrl);
436+
}
437+
else
438+
{
439+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动信息报告给API服务器:%s 失败,错误:%lX"), st_ServiceConfig.st_XReport.tszAPIUrl, InfoReport_GetLastError());
440+
}
441+
}
442+
else
443+
{
444+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中,信息报告给API服务器没有启用"));
445+
}
446+
430447
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,发行版本次数:%d,当前版本:%s。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->size(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str());
431448
while (true)
432449
{

0 commit comments

Comments
 (0)