|
|
@@ -9,6 +9,7 @@
|
|
|
#include <unistd.h>
|
|
|
#include <fcntl.h>
|
|
|
#include <errno.h>
|
|
|
+#include "RestfulFunc.h"
|
|
|
#endif //RVC_OS_WIN
|
|
|
#include "../mod_healthmanager/HealthManager_client_g.h"
|
|
|
using namespace HealthManager;
|
|
|
@@ -1474,8 +1475,17 @@ int CVtmLoaderFSM::HttpConnCheck(CSimpleStringA csHttAddr, HttpAddrType eType)
|
|
|
DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("to HttpConnCheck");
|
|
|
ULLINT beginTick = SP::Module::Comm::RVCGetTickCount();
|
|
|
int httpcheckCount = 1;
|
|
|
+ bool bCheckOK = false;
|
|
|
while(true){
|
|
|
- if (!checkHttpActive(csHttAddr.GetData()))
|
|
|
+#if defined(RVC_OS_LINUX)
|
|
|
+ string msg;
|
|
|
+ int curFlag = HttpProbe(csHttAddr.GetData(), msg, 5);
|
|
|
+ if (curFlag > 0 && curFlag < 400)
|
|
|
+ bCheckOK = true;
|
|
|
+#else
|
|
|
+ bCheckOK = checkHttpActive(csHttAddr.GetData());
|
|
|
+#endif
|
|
|
+ if (!bCheckOK)
|
|
|
{
|
|
|
LogWarn(Severity_Middle, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("尝试连接总行服务失败(%s),%d 秒后自动重试(第%d次重试)。请确认终端到总行服务网络是否正常", csHttAddr.GetData(), m_iDetectInterval/1000, httpcheckCount));
|
|
|
m_httpCheckResult[eType] = HttpConnResult_Failed;
|