Skip to content

Commit b9efadc

Browse files
xengine-qytxengine-qyt
committed
modify:enable client database.
1 parent 06d1356 commit b9efadc

File tree

2 files changed

+25
-28
lines changed

2 files changed

+25
-28
lines changed

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,20 @@ XHTHREAD XEngine_Task_P2PThread()
2727
if (Protocol_StorageParse_QueryFile(tszMsgBuffer, tszTimeStart, tszTimeEnd, tszBuckKey, tszFileName, tszFileHash))
2828
{
2929
//查询文件是否存在数据库,不存在不关心
30-
if (st_ServiceCfg.st_XSql.bEnable)
30+
int nListCount = 0;
31+
XSTORAGECORE_DBFILE** pppSt_ListFile;
32+
Database_Client_FileQuery(&pppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszBuckKey, tszFileName, tszFileHash);
33+
if (nListCount > 0)
3134
{
32-
int nListCount = 0;
33-
XSTORAGECORE_DBFILE** pppSt_ListFile;
34-
Database_File_FileQuery(&pppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszBuckKey, tszFileName, tszFileHash);
35-
if (nListCount > 0)
36-
{
37-
_stprintf(pppSt_ListFile[0]->tszTableName, _T("%s:%d"), st_ServiceCfg.tszIPAddr, st_ServiceCfg.nStorageDLPort);
38-
Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
39-
BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
35+
_stprintf(pppSt_ListFile[0]->tszTableName, _T("%s:%d"), st_ServiceCfg.tszIPAddr, st_ServiceCfg.nStorageDLPort);
36+
Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
37+
BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
4038

41-
SOCKET hSDSocket;
42-
NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
43-
NetCore_BroadCast_Send(hSDSocket, tszMsgBuffer, nMsgLen);
44-
NetCore_BroadCast_Close(hSDSocket);
45-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("广播端:%s,请求查询文件成功,列表个数:%d"), tszIPAddr, nListCount);
46-
}
39+
SOCKET hSDSocket;
40+
NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
41+
NetCore_BroadCast_Send(hSDSocket, tszMsgBuffer, nMsgLen);
42+
NetCore_BroadCast_Close(hSDSocket);
43+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("广播端:%s,请求查询文件成功,列表个数:%d"), tszIPAddr, nListCount);
4744
}
4845
}
4946
}

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ void ServiceApp_Stop(int signo)
7171
Session_DLStroage_Destory();
7272
Session_UPStroage_Destory();
7373
Database_File_Destory();
74+
Database_Client_Destory();
7475

7576
if (NULL != pSTDThread)
7677
{
@@ -173,13 +174,6 @@ int main(int argc, char** argv)
173174
signal(SIGABRT, ServiceApp_Stop);
174175
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化服务器信号管理成功"));
175176

176-
if (!APIHelp_HttpRequest_SetGlobalTime(1))
177-
{
178-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，设置PASS代理超时失败,错误:%lX"), APIHelp_GetLastError());
179-
goto XENGINE_EXITAPP;
180-
}
181-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，设置PASS代理超时成功"));
182-
183177
xhLimit = Algorithm_Calculation_Create();
184178
if (NULL == xhLimit)
185179
{
@@ -230,11 +224,16 @@ int main(int argc, char** argv)
230224
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化MYSQL数据库服务失败，错误：%lX"), Database_GetLastError());
231225
goto XENGINE_EXITAPP;
232226
}
233-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化MYSQL数据库服务成功"));
227+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化MYSQL数据库服务成功,数据库地址:%s"), st_ServiceCfg.st_XSql.tszSQLAddr);
234228
}
235229
else
236230
{
237-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，数据库被设置为不启用"));
231+
if (!Database_Client_Init(st_ServiceCfg.st_XSql.tszSQLFile))
232+
{
233+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化SQLite数据库服务失败，错误：%lX"), Database_GetLastError());
234+
goto XENGINE_EXITAPP;
235+
}
236+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化SQLite数据库服务成功,数据库地址:%s"), st_ServiceCfg.st_XSql.tszSQLFile);
238237
}
239238

240239
if (!Session_User_Init(st_ServiceCfg.st_XProxy.st_XProxyAuth.tszUserList))
@@ -445,8 +444,8 @@ int main(int argc, char** argv)
445444
goto XENGINE_EXITAPP;
446445
}
447446
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2XP任务处理线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nP2XPThread);
448-
449-
if (st_ServiceCfg.st_P2xp.nMode > 0)
447+
//默认为假才是客户端,才能启用P2P
448+
if (!st_ServiceCfg.st_XSql.bEnable)
450449
{
451450
if (!NetCore_BroadCast_RecvInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
452451
{
@@ -467,8 +466,8 @@ int main(int argc, char** argv)
467466
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务中，P2P存储服务配置为不启动"));
468467
}
469468
}
470-
m_StrVersion = st_ServiceCfg.st_XVer.pStl_ListStorage->front();
471-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("所有服务成功启动，存储中心服务运行中，发行版本次数:%d,当前运行版本：%s。。。"), st_ServiceCfg.st_XVer.pStl_ListStorage->size(), m_StrVersion.c_str());
469+
470+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("所有服务成功启动，存储中心服务运行中，发行版本次数:%d,当前运行版本：%s。。。"), st_ServiceCfg.st_XVer.pStl_ListStorage->size(), st_ServiceCfg.st_XVer.pStl_ListStorage->front().c_str());
472471

473472
while (bIsRun)
474473
{
@@ -513,6 +512,7 @@ int main(int argc, char** argv)
513512
Session_DLStroage_Destory();
514513
Session_UPStroage_Destory();
515514
Database_File_Destory();
515+
Database_Client_Destory();
516516

517517
if (NULL != pSTDThread)
518518
{

0 commit comments

Comments
 (0)