Skip to content

Commit f68a731

Browse files
xengine-qytxengine-qyt
committed
improved:upload log and pass code
improved:app log information with start
1 parent c6cd78e commit f68a731

File tree

5 files changed

+23
-27
lines changed

5 files changed

+23
-27
lines changed

‎XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
5959

6060
RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
6161
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
62-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,发送的方法不支持"), lpszClientAddr);
62+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("上传客户端:%s,发送的方法:%s 不支持"), lpszClientAddr, pSt_HTTPParam->tszHttpMethod);
6363
return FALSE;
6464
}
6565
if (!XEngine_APPHelp_ProxyAuth(lpszClientAddr, lpszMethodGet, pSt_HTTPParam->tszHttpUri, pptszListHdr, nHdrCount, STORAGE_NETTYPE_HTTPUPLOADER))

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskPass.cpp‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,21 @@ BOOL XEngine_Task_Pass(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lpsz
88

99
memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
1010
memset(&st_HDRParam, '\0', sizeof(RFCCOMPONENTS_HTTP_HDRPARAM));
11+
12+
st_HDRParam.bIsClose = TRUE;
13+
st_HDRParam.nHttpCode = 200;
1114
//下载
1215
if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_UPFILE, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_UPFILE)))
1316
{
14-
__int64x nFileSize = 0;
15-
TCHAR tszFileName[MAX_PATH];
16-
TCHAR tszFileHash[MAX_PATH];
1717
TCHAR tszClientAddr[128];
18+
XSTORAGECORE_DBFILE st_DBFile;
1819

19-
memset(tszFileName, '\0', MAX_PATH);
20-
memset(tszFileHash, '\0', MAX_PATH);
2120
memset(tszClientAddr, '\0', sizeof(tszClientAddr));
21+
memset(&st_DBFile, '\0', sizeof(XSTORAGECORE_DBFILE));
2222

23-
Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, tszClientAddr, tszFileName, tszFileHash, &nFileSize);
24-
25-
st_HDRParam.bIsClose = TRUE;
26-
st_HDRParam.nHttpCode = 200;
27-
28-
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
23+
Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, tszClientAddr, st_DBFile.st_ProtocolFile.tszFileName, st_DBFile.st_ProtocolFile.tszFileHash, &st_DBFile.st_ProtocolFile.nFileSize);
2924
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
30-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的上传文件通知协议成功,文件:%s,大小:%lld"), lpszClientAddr, tszFileName, nFileSize);
25+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的上传文件通知协议成功,文件名:%s,大小:%d"), lpszClientAddr, st_DBFile.st_ProtocolFile.tszFileName, st_DBFile.st_ProtocolFile.nFileSize);
3126
}
3227
else if (0 == _tcsnicmp(XENGINE_STORAGE_APP_METHOD_DLFILE, lpszAPIName, _tcslen(XENGINE_STORAGE_APP_METHOD_DLFILE)))
3328
{
@@ -42,9 +37,6 @@ BOOL XEngine_Task_Pass(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lpsz
4237

4338
Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, tszClientAddr, tszFileName, tszFileHash, &nFileSize);
4439

45-
st_HDRParam.bIsClose = TRUE;
46-
st_HDRParam.nHttpCode = 200;
47-
4840
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
4941
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
5042
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求的下载文件通知协议成功,文件:%s,大小:%lld"), lpszClientAddr, tszFileName, nFileSize);

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,11 @@ int main(int argc, char** argv)
279279
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务器中，启动下载SSL服务失败，错误：%lX"), Session_GetLastError());
280280
goto XENGINE_EXITAPP;
281281
}
282-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动下载SSL服务成功,验证模式:%d"), st_ServiceCfg.st_XCert.nSslType);
282+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动下载SSL服务成功,证书链:%s,证书Key:%s,验证模式:%d"), st_ServiceCfg.st_XCert.tszCertChain, st_ServiceCfg.st_XCert.tszCertKey, st_ServiceCfg.st_XCert.nSslType);
283+
}
284+
else
285+
{
286+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务器中，检测到没有启用下载SSL服务"));
283287
}
284288

285289
if (!NetCore_TCPXCore_StartEx(&xhNetDownload, st_ServiceCfg.nStorageDLPort, st_ServiceCfg.st_XMax.nMaxClient, st_ServiceCfg.st_XMax.nIOThread, FALSE, st_ServiceCfg.bReuseraddr))
@@ -333,7 +337,11 @@ int main(int argc, char** argv)
333337
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务器中，启动上传SSL服务失败，错误：%lX"), Session_GetLastError());
334338
goto XENGINE_EXITAPP;
335339
}
336-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动上传SSL服务成功,验证模式:%d"), st_ServiceCfg.st_XCert.nSslType);
340+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动上传SSL服务成功,证书链:%s,证书Key:%s,验证模式:%d"), st_ServiceCfg.st_XCert.tszCertChain, st_ServiceCfg.st_XCert.tszCertKey, st_ServiceCfg.st_XCert.nSslType);
341+
}
342+
else
343+
{
344+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务器中，检测到没有启用上传SSL服务"));
337345
}
338346

339347
if (!NetCore_TCPXCore_StartEx(&xhNetUPLoader, st_ServiceCfg.nStorageUPPort, st_ServiceCfg.st_XMax.nMaxClient, st_ServiceCfg.st_XMax.nIOThread, FALSE, st_ServiceCfg.bReuseraddr))
@@ -380,7 +388,11 @@ int main(int argc, char** argv)
380388
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务器中，启动业务SSL服务失败，错误：%lX"), Session_GetLastError());
381389
goto XENGINE_EXITAPP;
382390
}
383-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动业务SSL服务成功,验证模式:%d"), st_ServiceCfg.st_XCert.nSslType);
391+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务器中，启动业务SSL服务成功,证书链:%s,证书Key:%s,验证模式:%d"), st_ServiceCfg.st_XCert.tszCertChain, st_ServiceCfg.st_XCert.tszCertKey, st_ServiceCfg.st_XCert.nSslType);
392+
}
393+
else
394+
{
395+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _T("启动服务器中，检测到没有启用业务SSL服务"));
384396
}
385397

386398
if (!NetCore_TCPXCore_StartEx(&xhNetCenter, st_ServiceCfg.nCenterPort, st_ServiceCfg.st_XMax.nMaxClient, st_ServiceCfg.st_XMax.nIOThread, FALSE, st_ServiceCfg.bReuseraddr))

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
<ClCompile Include="StorageApp_Network.cpp" />
157157
<ClCompile Include="StorageApp_UPLoader.cpp" />
158158
<ClCompile Include="Storage_APPHelp\Storage_APPHelp.cpp" />
159-
<ClCompile Include="Storage_APPTask\Storage_TaskEvent.cpp" />
160159
<ClCompile Include="Storage_APPTask\Storage_TaskManage.cpp" />
161160
<ClCompile Include="Storage_APPTask\Storage_TaskP2p.cpp" />
162161
<ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp" />
@@ -172,7 +171,6 @@
172171
<ClInclude Include="StorageApp_P2XPNet.h" />
173172
<ClInclude Include="StorageApp_UPLoader.h" />
174173
<ClInclude Include="Storage_APPHelp\Storage_APPHelp.h" />
175-
<ClInclude Include="Storage_APPTask\Storage_TaskEvent.h" />
176174
<ClInclude Include="Storage_APPTask\Storage_TaskManage.h" />
177175
<ClInclude Include="Storage_APPTask\Storage_TaskP2p.h" />
178176
<ClInclude Include="Storage_APPTask\Storage_TaskPass.h" />

‎XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj.filters‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
<ClCompile Include="StorageApp_Center.cpp">
4646
<Filter>源文件</Filter>
4747
</ClCompile>
48-
<ClCompile Include="Storage_APPTask\Storage_TaskEvent.cpp">
49-
<Filter>源文件\Storage_APPTask</Filter>
50-
</ClCompile>
5148
<ClCompile Include="Storage_APPTask\Storage_TaskPass.cpp">
5249
<Filter>源文件\Storage_APPTask</Filter>
5350
</ClCompile>
@@ -83,9 +80,6 @@
8380
<ClInclude Include="StorageApp_Center.h">
8481
<Filter>头文件</Filter>
8582
</ClInclude>
86-
<ClInclude Include="Storage_APPTask\Storage_TaskEvent.h">
87-
<Filter>头文件\Storage_APPTask</Filter>
88-
</ClInclude>
8983
<ClInclude Include="Storage_APPTask\Storage_TaskPass.h">
9084
<Filter>头文件\Storage_APPTask</Filter>
9185
</ClInclude>

0 commit comments

Comments
 (0)