浏览代码

脚本日志文件轮数后缀名;

Jeff 5 年之前
父节点
当前提交
408a98deec

+ 3 - 3
SATService/SATService/SATDevices.cpp

@@ -144,13 +144,13 @@ DWORD CSATDevices::WorkThread(LPVOID lpVoid)
 		GetCurrentDevices(vtDevices);
 		AutoThreadSection ats(&s_ThreadSection);
 #ifdef _DEBUG
-		TRACE(_T("\t=================start==================\n"));
+		//TRACE(_T("\t=================start==================\n"));
 #endif
 		// 遍历设备列表是否有下线设备;
 		std::vector<SATDEV::STDevice>::iterator it = s_vtDevices.begin();
 		for ( ;it != s_vtDevices.end(); ) {
 #ifdef _DEBUG
-		TRACE3(_T("\t当前设备类型:%d, 设备名称:%s, 设备状态:%d\n"), it->nType, it->strName.c_str(), it->nStatus);
+		//TRACE3(_T("\t当前设备类型:%d, 设备名称:%s, 设备状态:%d\n"), it->nType, it->strName.c_str(), it->nStatus);
 #endif
 			if ( it->nType == SATDEV::Virtual ) {
 				it++;
@@ -231,7 +231,7 @@ DWORD CSATDevices::WorkThread(LPVOID lpVoid)
 		// 保存全部设备状态;
 		SaveAllDevicesStatus2Config();
 #ifdef _DEBUG
-		TRACE(_T("\t=================end==================\n"));
+		//TRACE(_T("\t=================end==================\n"));
 #endif
 	} while (WaitForSingleObject(that->m_hEvent, 2500) == WAIT_TIMEOUT);
 

+ 2 - 2
SATService/SATService/SATExecutor.cpp

@@ -191,13 +191,13 @@ SATHTTP::STCase* CSATExecutor::ExecuteFreeCaseScript(SATHTTP::STTask* pTask)
 #endif
 		// 命令行:{"Round": %d}
 		TCHAR szCommandLine[MAX_PATH] = { 0 };
-		_stprintf_s(szCommandLine, _T("{'Round': '%s'}"), pCase->_strRoundNum.c_str());
+		_stprintf_s(szCommandLine, _T("{'Round': %s}"), pCase->_strRoundNum.c_str());
 		if ( !pCase->_pExcutor ) {
 			CPythonExecutor *pExcutor = new CPythonExecutor(); 
 			if ( pExcutor ) {
 				pCase->_pExcutor = pExcutor;
 				// 用例的日志文件路径;
-				pCase->_strCaseLog = pCase->_strFileDir + pCase->_strFileName + ".txt";
+				pCase->_strCaseLog = pCase->_strFileDir + pCase->_strFileName + _T("_") + pCase->_strRoundNum + ".txt";
 				if ( pExcutor->InitScript(pCase->_strScriptPath, pCase->_strCaseLog, szCommandLine) ) {
 					// 设置用例对象;
 					pExcutor->SetCaseObje(pCase);

+ 2 - 2
SATService/SATService/SATService.cpp

@@ -80,8 +80,8 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 
 		// Ö¸¶¨Ê±¼äÍ£Ö¹;
 		ULONGLONG ulTickCount = GetTickCount64();
-		while (GetTickCount64() - ulTickCount < 1800000 )
-		//while(1)
+		//while (GetTickCount64() - ulTickCount < 1800000 )
+		while(1)
 		{
 			//printf("µ¹¼ÆÊ±£º%ld\n",GetTickCount64() - ulTickCount);
 			Sleep(1000);