#IQRV #comment [Module] 一轮测试期间不做任何上传操作

Module/mod_upload/CMakeLists.txt

@@ -35,7 +35,7 @@ set(${MODULE_PREFIX}_SRCS
 endif(WIN32)
 
 #设置版本
-set(MOD_VERSION_STRING "1.0.0-dev1")
+set(MOD_VERSION_STRING "1.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 

Module/mod_upload/ChangeLog

@@ -0,0 +1,2 @@
+## 1.0.1-dev1
+* 一轮测试阶段不上传任何文件，停用相关上传功能

Module/mod_upload/UploadFSM.cpp

@@ -35,7 +35,9 @@ void UploadFSM::OnSysVarEvent( const char *pszKey, const char *pszValue,const ch
 {
 	Dbg("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
 	if (pszValue[0] == 'O') {
-		PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
+		//PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
+		LogWarn(Severity_High, Error_NotSupport, 0, "一轮测试期间不做任何上传操作！");
+		PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
 	} else {
 		PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
 	}
@@ -45,10 +47,10 @@ ErrorCodeEnum UploadFSM::OnInit()
 {
 	ErrorCodeEnum Error;
 
-	Error = LoadServerConfig();
+	Error = LoadServerConfigFromCenterSetting();
 	if (Error != Error_Succeed) 
 	{
-		LOG_TRACE("load server config failed!");
+		LogWarn(Severity_High, Error, 0, "从集中配置读取配置信息失败");
 		return Error;
 	}
 
@@ -100,6 +102,7 @@ ErrorCodeEnum UploadFSM::OnInit()
 			
 		}
 	}
+
 	CSimpleStringA checkStr="";
 	{
 		CSmartPointer<IConfigInfo> spConfig;
@@ -156,7 +159,9 @@ void UploadFSM::s0_on_entry()
 	ErrorCodeEnum Error = m_pEntity->GetFunction()->GetSysVar("CallState", strValue);
 	if (Error == Error_Succeed) {
 		if (strValue[0] == 'O') { // only upload when CallState in offline state
-			PostEventLIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
+			//PostEventLIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
+			PostEventLIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
+			LogWarn(Severity_High, Error_NotSupport, 0, "一轮测试期间不做任何上传操作！");
 		} else {
 			PostEventLIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
 		}
@@ -590,7 +595,7 @@ static ErrorCodeEnum ParseIPAddress( const char *str, CSimpleStringA &ip, int &p
 	return Error;
 }
 
-ErrorCodeEnum UploadFSM::LoadServerConfig()
+ErrorCodeEnum UploadFSM::LoadServerConfigFromCenterSetting()
 {
 	CSmartPointer<IEntityFunction> spFunction = m_pEntity->GetFunction();
 	CSmartPointer<IConfigInfo> spConfig;

Module/mod_upload/UploadFSM.h

@@ -163,7 +163,7 @@ public:
 	unsigned int s6_on_event(FSMEvent* event);
 
 private:
-	ErrorCodeEnum LoadServerConfig();
+	ErrorCodeEnum LoadServerConfigFromCenterSetting();
 	file_t *find_first_upload_file();
 	void post_process();
 	int getUploadFileNum(int &fileSumlen);