Эх сурвалжийг харах

修复脚本下载失败时,用例空时无法正常标记用例为已运行和失败的问题;

scbc.sat2 5 жил өмнө
parent
commit
15b66e93f6

+ 5 - 0
SATService/SATService/SATExecutor.cpp

@@ -1066,6 +1066,7 @@ DWORD CSATExecutor::HearbeatThread(LPVOID lpVoid)
 					// 将任务压入队列中;
 					AutoThreadSection ats(&that->m_csTask);
 					// 同时下载任务;
+					GLOBAL::WriteTextLog(_T("【任务脚本下载】:%s"), it->Job.strUniqueId.c_str());
 					std::string host = GLOBAL::g_stSATConfig.szCaseServer;
 					std::string url = host + "/ajaxInteractiveManage!getCaseFileListUrl.action";
 					std::vector<SATHTTP::STCase>::iterator _case = it->Job.vtCases.begin();
@@ -1084,6 +1085,10 @@ DWORD CSATExecutor::HearbeatThread(LPVOID lpVoid)
 							_case->_strFileName = stScriptUrlResp._strFileName;
 							_case->_strScriptPath = stScriptUrlResp._strScripFile;
 						}
+						else
+						{
+							GLOBAL::WriteTextLog(_T("【下载脚本失败】:%s"), _case->strCaseName.c_str());
+						}
 					}
 
 					that->m_vtTask.push_back(*it);

+ 0 - 8
SATService/SATService/SATTCPServer.cpp

@@ -721,10 +721,6 @@ void CSATTCPServer::_ShowMessage(const CString szFormat,...) const
 #define PAK_LEN sizeof(SATPROTO::DataHeader)
 void CSATTCPServer::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONTEXT* pIoContext)
 {
-#ifdef _DEBUG
-	OutputDebugString("有数据返回\n");
-#endif
-	//GLOBAL::WriteTextLog("有数据返回");
 	// 小于包头;
 	SATPROTO::DataHeader* phead = NULL;
 	if (pSocketContext->lastData.size() == 0)
@@ -880,10 +876,6 @@ void CSATTCPServer::_RecvProcess(PER_SOCKET_CONTEXT* pSocketContext, PER_IO_CONT
 
 void CSATTCPServer::_TaskProcess(PER_IO_CONTEXT* pIoContext, SATPROTO::Package* pak)
 {
-#ifdef _DEBUG
-	OutputDebugString("\n########成功获取数据########\n\n");
-#endif
-	//GLOBAL::WriteTextLog("成功获取数据");
 	SATPROTO::DataHeader *pHeader = &pak->header;
 	if ( !pHeader ) 
 		return;