Skip to content

Commit be9b3b9

Browse files
xengine-qytxengine-qyt
committed
modify:speed limit support
added:configure for action
1 parent 048fe7e commit be9b3b9

5 files changed

Lines changed: 37 additions & 10 deletions

File tree

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ typedef struct tag_XEngine_ServerConfig
109109
XCHAR tszServiceName[128];
110110
bool bEnable;
111111
}st_XReport;
112+
struct
113+
{
114+
int nSDMax;
115+
int nRVMax;
116+
bool bEnable;
117+
}st_XAction;
112118
struct
113119
{
114120
list<string> *pStl_ListStorage;

‎XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,17 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
235235
pSt_ServerConfig->st_XReport.bEnable = st_JsonReport["bEnable"].asBool();
236236
_tcsxcpy(pSt_ServerConfig->st_XReport.tszServiceName, st_JsonReport["tszServiceName"].asCString());
237237
_tcsxcpy(pSt_ServerConfig->st_XReport.tszAPIUrl, st_JsonReport["tszAPIUrl"].asCString());
238+
239+
if (st_JsonRoot["XAction"].empty() || (3 != st_JsonRoot["XAction"].size()))
240+
{
241+
Config_IsErrorOccur = true;
242+
Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_CREPORT;
243+
return false;
244+
}
245+
Json::Value st_JsonXAction = st_JsonRoot["XAction"];
246+
pSt_ServerConfig->st_XAction.bEnable = st_JsonXAction["bEnable"].asBool();
247+
pSt_ServerConfig->st_XAction.nSDMax = st_JsonXAction["nSDMax"].asInt();
248+
pSt_ServerConfig->st_XAction.nRVMax = st_JsonXAction["nRVMax"].asInt();
238249
return true;
239250
}
240251
/********************************************************************

‎XEngine_Source/XEngine_StorageApp/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool
1111
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -lStorageModule_BTorrent \
1212
-ljsoncpp -lXEngine_InfoReport
1313
LIBEX =
14-
OBJECTS = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o
14+
OBJECTS = Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o Storage_TaskAction.o \
15+
StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o XEngine_StorageApp.o
1516

1617
ifeq ($(RELEASE),1)
1718
FLAGS = -c
@@ -65,6 +66,8 @@ Storage_TaskManage.o:./Storage_APPTask/Storage_TaskManage.cpp
6566
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Storage_APPTask/Storage_TaskManage.cpp
6667
Storage_TaskP2p.o:./Storage_APPTask/Storage_TaskP2p.cpp
6768
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Storage_APPTask/Storage_TaskP2p.cpp
69+
Storage_TaskAction.o:./Storage_APPTask/Storage_TaskAction.cpp
70+
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Storage_APPTask/Storage_TaskAction.cpp
6871

6972
XEngine_StorageApp.o:./XEngine_StorageApp.cpp
7073
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_StorageApp.cpp

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskAction.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
7474
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,存储Key解析失败,URL:%s,路径:%s,Bucket:%s"), lpszClientAddr, st_ActionInfo.tszFileUrl, st_ActionInfo.tszFileName, st_ActionInfo.tszBucketStr);
7575
return false;
7676
}
77-
_stprintf(tszFileName, _X("%s/%s"), st_StorageBucket.tszFilePath, st_ActionInfo.tszFileName);
77+
_xstprintf(tszFileName, _X("%s/%s"), st_StorageBucket.tszFilePath, st_ActionInfo.tszFileName);
7878
if (0 == _tcsxnicmp(lpszAPIDownload, lpszAPIName, _tcsxlen(lpszAPIDownload)))
7979
{
8080
XNETHANDLE xhToken = 0;
@@ -89,8 +89,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
8989
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,下载文件失败,URL:%s,路径:%s,Bucket:%s"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, st_ActionInfo.tszBucketStr);
9090
return false;
9191
}
92+
APIClient_File_SetMaxSpeed(xhAction, st_ServiceCfg.st_XAction.nSDMax, st_ServiceCfg.st_XAction.nRVMax);
9293
APIClient_File_Start(xhAction);
93-
//APIClient_File_SetMaxSpeed(xhAction);
9494
Session_Action_Insert(xhToken, xhAction, &st_ActionInfo);
9595
Protocol_StoragePacket_Action(tszRVBuffer, &nRVLen, xhToken, &st_ActionInfo);
9696
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
@@ -111,8 +111,8 @@ bool Storage_TaskAction(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lps
111111
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,处理用户转录动作失败,下载文件失败,URL:%s,路径:%s,Bucket:%s"), lpszClientAddr, st_ActionInfo.tszFileUrl, tszFileName, st_ActionInfo.tszBucketStr);
112112
return false;
113113
}
114+
APIClient_File_SetMaxSpeed(xhAction, st_ServiceCfg.st_XAction.nSDMax, st_ServiceCfg.st_XAction.nRVMax);
114115
APIClient_File_Start(xhAction);
115-
//APIClient_File_SetMaxSpeed(xhAction);
116116
Session_Action_Insert(xhToken, xhAction, &st_ActionInfo);
117117
Protocol_StoragePacket_Action(tszRVBuffer, &nRVLen, xhToken, &st_ActionInfo);
118118
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,21 @@ int main(int argc, char** argv)
448448
{
449449
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，P2P存储服务配置为不启动"));
450450
}
451-
452-
pSTDThread_Action = make_shared<std::thread>(Session_Action_Thread);
453-
if (!pSTDThread_Action->joinable())
451+
//Action转录
452+
if (st_ServiceCfg.st_XAction.bEnable)
454453
{
455-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中，启动转录动作处理线程失败，错误：%d"), errno);
456-
goto XENGINE_EXITAPP;
454+
pSTDThread_Action = make_shared<std::thread>(Session_Action_Thread);
455+
if (!pSTDThread_Action->joinable())
456+
{
457+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中，启动转录动作处理线程失败，错误：%d"), errno);
458+
goto XENGINE_EXITAPP;
459+
}
460+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，启动转录动作处理线程成功"));
461+
}
462+
else
463+
{
464+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，转录动作没有启用"));
457465
}
458-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，启动转录动作处理线程成功"));
459466
//发送信息报告
460467
if (st_ServiceCfg.st_XReport.bEnable)
461468
{

0 commit comments

Comments
 (0)