From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
index 3263723..1ccda7a 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -61,7 +61,6 @@
res = selfHttpUtil.get(prefix + monitor.getIp(), null, null);
monitor.setPingOnline(Objects.nonNull(res) && HttpStatus.OK == res.getStatusCode());
} catch (Exception e) {
- log.error("web妫�娴嬬绾�"+monitor.getIp());
monitor.setPingOnline(Boolean.FALSE);
}
// 濡傛灉http寰楀埌鐨勪笉鍦ㄧ嚎锛岄偅涔堝啀ping涓�涓�
@@ -86,12 +85,7 @@
map = new HashMap<>();
}
if (!monitor.getPingOnline()) {
- try {
- reachable = InetAddress.getByName(monitor.getIp()).isReachable(5000);
- } catch (IOException e) {
- log.error("Ping寮傚父{}",e.getMessage());
- }
- if(!reachable) log.error("ping妫�娴嬬绾�"+monitor.getIp());
+ reachable = checkPing(monitor, reachable);
monitor.setPingOnline(reachable);
}
if (!monitor.getPingOnline()) {
@@ -123,6 +117,22 @@
return monitor;
}
+ private boolean checkPing(TMonitorResult monitor, boolean reachable) {
+ try {
+ int[] sleepTimes = {5000, 15000, 30000};
+ for (int sleepTime : sleepTimes) {
+ reachable = InetAddress.getByName(monitor.getIp()).isReachable(5000);
+ if (reachable) {
+ break;
+ }
+ Thread.sleep(sleepTime);
+ }
+ } catch (Exception e) {
+ log.error("Ping寮傚父",e);
+ }
+ return reachable;
+ }
+
/**
* 鐩戞祴鐐逛綅鍦ㄧ嚎
--
Gitblit v1.8.0