Commit 8b075ab8 authored by renjie's avatar renjie

健康检查修改

parent f261ccb3
...@@ -117,7 +117,7 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto ...@@ -117,7 +117,7 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
MatchOperation match = Aggregation.match(matchCriteria); MatchOperation match = Aggregation.match(matchCriteria);
SampleOperation sample = Aggregation.sample(20); SampleOperation sample = Aggregation.sample(100);
AggregationResults<IpResource> results = mongoTemplate.aggregate(Aggregation.newAggregation(match, sample), IpResource.class, IpResource.class); AggregationResults<IpResource> results = mongoTemplate.aggregate(Aggregation.newAggregation(match, sample), IpResource.class, IpResource.class);
List<IpResource> mappedResults = results.getMappedResults(); List<IpResource> mappedResults = results.getMappedResults();
......
...@@ -219,12 +219,11 @@ public class BrowserTask { ...@@ -219,12 +219,11 @@ public class BrowserTask {
} }
} }
@Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 0/5 * * * ?")
public void healthCheck() { public void healthCheck() {
List<IpResource> ipResources = ipResourceRepository.sampleTasks(Arrays.asList(0, 2)); List<IpResource> ipResources = ipResourceRepository.sampleTasks(Arrays.asList(0, 2));
for (IpResource ipResource : ipResources) { for (IpResource ipResource : ipResources) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
CompletableFuture.runAsync(() -> {
if (ipResourceRepository.healthLock(ipResource)) { if (ipResourceRepository.healthLock(ipResource)) {
try { try {
QueryIpUrlList queryIpUrlList = queryIpUrlListRepository.findAll().get(0); QueryIpUrlList queryIpUrlList = queryIpUrlListRepository.findAll().get(0);
...@@ -250,8 +249,8 @@ public class BrowserTask { ...@@ -250,8 +249,8 @@ public class BrowserTask {
int failTime = 0; int failTime = 0;
while (!result.contains(ipResource.getAddr())) { while (!result.contains(ipResource.getAddr())) {
if (failTime > 5) { if (failTime > 5) {
NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 专线代理异常", NotifyUtils.MsgType.WEBHOOK); NotifyUtils.sendMessage("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常", NotifyUtils.MsgType.WEBHOOK);
log.error("防关联浏览器 ip " + ipResource.getAddr() + " 专线代理异常 " + result); log.error("防关联浏览器 ip " + ipResource.getAddr() + " 代理异常 " + result);
break; break;
} }
failTime ++; failTime ++;
...@@ -274,7 +273,6 @@ public class BrowserTask { ...@@ -274,7 +273,6 @@ public class BrowserTask {
} }
} }
} }
}, ThreadPoolUtils.queryIpHealth);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment