Skip to content

Commit 5b4e141

Browse files
committed
modify:get one bucket info
1 parent ee6f63b commit 5b4e141

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ bool CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCXSTR lpszMsgBu
268268
{
269269
Protocol_IsErrorOccur = false;
270270

271-
if ((NULL == lpszMsgBuffer) || (NULL == ptszUserDir))
271+
if ((NULL == lpszMsgBuffer))
272272
{
273273
Protocol_IsErrorOccur = true;
274274
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_PARAMENT;
@@ -289,15 +289,15 @@ bool CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCXSTR lpszMsgBu
289289
delete pSt_JsonReader;
290290
pSt_JsonReader = NULL;
291291

292-
if (!st_JsonRoot["nOPerator"].isNull())
292+
if (!st_JsonRoot["nOPerator"].isNull() && NULL != pInt_Operator)
293293
{
294294
*pInt_Operator = st_JsonRoot["nOPerator"].asInt();
295295
}
296-
if (!st_JsonRoot["lpszBuckKey"].isNull())
296+
if (!st_JsonRoot["lpszBuckKey"].isNull() && NULL != ptszBuckKey)
297297
{
298298
_tcsxcpy(ptszBuckKey, st_JsonRoot["lpszBuckKey"].asCString());
299299
}
300-
if (!st_JsonRoot["lpszUserDir"].isNull())
300+
if (!st_JsonRoot["lpszUserDir"].isNull() && NULL != ptszUserDir)
301301
{
302302
_tcsxcpy(ptszUserDir, st_JsonRoot["lpszUserDir"].asCString());
303303
}

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,29 @@ bool XEngine_Task_Manage(LPCXSTR lpszAPIName, LPCXSTR lpszClientAddr, LPCXSTR lp
354354
}
355355
else if (0 == _tcsxnicmp(lpszAPIBucket, lpszAPIName, _tcsxlen(lpszAPIBucket)))
356356
{
357-
Protocol_StoragePacket_Bucket(tszRVBuffer, &nRVLen, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket);
357+
XCHAR tszBuckKey[MAX_PATH] = {};
358+
Protocol_StorageParse_DirOperator(lpszMsgBuffer, NULL, tszBuckKey, NULL);
359+
if (_tcsxlen(tszBuckKey) > 0)
360+
{
361+
XENGINE_STORAGEBUCKET st_StorageBucket = {};
362+
if (!APIHelp_Distributed_CTStorage(tszBuckKey, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket))
363+
{
364+
st_HDRParam.bIsClose = true;
365+
st_HDRParam.nHttpCode = 404;
366+
367+
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
368+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
369+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("业务客户端:%s,请求获取BUCKET:%s,信息失败,错误:%lX"), lpszClientAddr, tszBuckKey, StorageHelp_GetLastError());
370+
return false;
371+
}
372+
list<XENGINE_STORAGEBUCKET> stl_ListBucket;
373+
stl_ListBucket.push_back(st_StorageBucket);
374+
Protocol_StoragePacket_Bucket(tszRVBuffer, &nRVLen, &stl_ListBucket);
375+
}
376+
else
377+
{
378+
Protocol_StoragePacket_Bucket(tszRVBuffer, &nRVLen, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket);
379+
}
358380
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen);
359381
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
360382
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求获取BUCKET信息成功"), lpszClientAddr);

0 commit comments

Comments
 (0)