Skip to content

Commit 24e50f7

Browse files
committed
fixed:plugin failed to execution without tips.
1 parent 5464e8b commit 24e50f7

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HTTPTask.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@ XHTHREAD CALLBACK XEngine_HTTPTask_Thread(LPVOID lParam)
3939

4040
memset(&st_HTTPReqparam, '\0', sizeof(RFCCOMPONENTS_HTTP_REQPARAM));
4141
//得到一个指定客户端的完整数据包
42-
if (!RfcComponents_HttpServer_GetMemoryEx(xhHTTPPacket, ppSst_ListAddr[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPReqparam))
42+
if (RfcComponents_HttpServer_GetMemoryEx(xhHTTPPacket, ppSst_ListAddr[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPReqparam))
4343
{
44-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("HTTP客户端:%s,获取数据包失败,错误:%lX"), ppSst_ListAddr[i]->tszClientAddr, HttpServer_GetLastError());
45-
continue;
44+
//在另外一个函数里面处理数据
45+
XEngine_HTTPTask_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen);
46+
//释放内存
47+
BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);
4648
}
47-
//在另外一个函数里面处理数据
48-
XEngine_HTTPTask_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen);
49-
//释放内存
50-
BaseLib_OperatorMemory_FreeCStyle((VOID**)&ptszMsgBuffer);
5149
}
5250
}
5351
BaseLib_OperatorMemory_Free((XPPPMEM)&ppSst_ListAddr, nListCount);

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_PluginTask.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,20 @@ BOOL XEngine_PluginTask_Handle(LPCTSTR lpszMethodName, LPCTSTR lpszClientAddr, L
2323
memset(&st_HDRParament, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
2424

2525
st_HDRParament.bIsClose = TRUE;
26+
st_HDRParament.nHttpCode = 200;
2627
_tcscpy(st_HDRParament.tszMimeType, "json");
2728

28-
ModulePlugin_Loader_Exec(lpszMethodName, ppptszList, nListCount, &st_HDRParament.nHttpCode, tszPktBuffer, &nPktLen);
29-
RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParament, tszPktBuffer, nPktLen);
29+
if (ModulePlugin_Loader_Exec(lpszMethodName, ppptszList, nListCount, &st_HDRParament.nHttpCode, tszPktBuffer, &nPktLen))
30+
{
31+
RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParament, tszPktBuffer, nPktLen);
32+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("HTTP客户端:%s,请求的方法:%s,由%s插件模块处理成功"), lpszClientAddr, lpszMethodName, 0 == nPluginType ? "Lib" : "Lua");
33+
}
34+
else
35+
{
36+
st_HDRParament.nHttpCode = 400;
37+
RfcComponents_HttpServer_SendMsgEx(xhHTTPPacket, tszMsgBuffer, &nMsgLen, &st_HDRParament);
38+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("HTTP客户端:%s,请求的方法:%s,由%s插件模块处理失败,错误:%lX"), lpszClientAddr, lpszMethodName, 0 == nPluginType ? "Lib" : "Lua", ModulePlugin_GetLastError());
39+
}
3040
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen);
31-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("HTTP客户端:%s,请求的方法:%s,由%s插件模块处理成功"), lpszClientAddr, lpszMethodName, 0 == nPluginType ? "Lib" : "Lua");
3241
return TRUE;
3342
}

0 commit comments

Comments
 (0)