!2 add firewall now can set max waittime now

Framework/Common/SpBase.h

@@ -1060,7 +1060,7 @@ struct IEntityFunction
 
 	virtual ErrorCodeEnum GetToken(CSimpleString& channelId, CSimpleString& token) = 0;
 
-	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString& pszPath) = 0;
+	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString& pszPath, int maxWaitTime = 30) = 0;
 	/* GetRunningVersion
 	currently return version in active.txt, may be it will return the version from micro sever latter.
 	*/

Framework/libtoolkit/log.c

@@ -453,9 +453,6 @@ TOOLKIT_API int xlog_log_v(const char *inst, int level, const char *fmt, va_list
 			logfactory_log_record(log->factory, log, level, ft.dwLowDateTime, ft.dwHighDateTime, buf, strlen(buf));
 			free(buf);
 		}
-		
-		
-		
 		return 0;
 	}
 	return -1;

Framework/spbase/SpEntity.cpp

@@ -1748,7 +1748,7 @@ ErrorCodeEnum SpEntity::GetToken(CSimpleString &channelId, CSimpleString &token)
 		return ErrorCodeEnum::Error_Succeed;
 }
 
-ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath)
+ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitTime)
 {
 	if (pszPath.GetLength() == 0) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall param error");
@@ -1764,7 +1764,7 @@ ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath)
 
 	std::future<ErrorCodeEnum> result = std::async(std::launch::async, addFirewall_worker, pszPath.GetData());
 
-	auto status = result.wait_for(std::chrono::seconds(30));
+	auto status = result.wait_for(std::chrono::seconds(maxWaitTime));
 	if (status == std::future_status::ready)
 	{
 		auto ret = result.get();
@@ -1773,7 +1773,7 @@ ErrorCodeEnum SpEntity::SetNewPathToFirewall(CSimpleString &pszPath)
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall run over 30s");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SetNewPathToFirewall run over %d seconds", maxWaitTime);
 		return Error_TimeOut;
 	}
 

Framework/spbase/SpEntity.h

@@ -125,7 +125,7 @@ public:
 	virtual ErrorCodeEnum GetEntityLogPath(const char* pszEntityName, CEntityLogInfo& Info);
 	virtual WORD GetDevID();
 	virtual ErrorCodeEnum GetToken(CSimpleString &channelId, CSimpleString &token);
-	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString &pszPath); // Input path:D:\\Runxxx\\version\\7.1.1.1
+	virtual ErrorCodeEnum SetNewPathToFirewall(CSimpleString &pszPath, int maxWaitTime = 30); // Input path:D:\\Runxxx\\version\\7.1.1.1
 
 	// connect
 	virtual ErrorCodeEnum ConnectRemoteEntity(CClientSessionBase *pClientSession, const char *pszRemoteEntity,const char *pszParam,CSmartPointer<IAsynWaitSp> &pAsynWaitSp);