OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[monitor] 连接外部服务shutdown优雅退出

Browse Source
This commit is contained in:
tomsun28
2021-11-25 20:24:55 +08:00
parent d88812ab04
commit 00be374aaa
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
collector/server/src/main/java/com/usthe/collector/dispatch/WorkerPool.java
View File

@@ -2,6 +2,7 @@ package com.usthe.collector.dispatch;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
@@ -17,7 +18,7 @@ import java.util.concurrent.TimeUnit;
*/ */
@Component @Component
@Slf4j @Slf4j
public class WorkerPool { public class WorkerPool implements DisposableBean {
private ThreadPoolExecutor workerExecutor; private ThreadPoolExecutor workerExecutor;
@@ -51,4 +52,11 @@ public class WorkerPool {
public void executeJob(Runnable runnable) throws RejectedExecutionException { public void executeJob(Runnable runnable) throws RejectedExecutionException {
workerExecutor.execute(runnable); workerExecutor.execute(runnable);
} }
@Override
public void destroy() throws Exception {
if (workerExecutor != null) {
workerExecutor.shutdownNow();
}
}
} }

11
collector/server/src/main/java/com/usthe/collector/dispatch/export/KafkaDataExporter.java
View File

@@ -7,7 +7,7 @@ import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.LongSerializer; import org.apache.kafka.common.serialization.LongSerializer;
import org.apache.kafka.common.serialization.StringSerializer; import org.springframework.beans.factory.DisposableBean;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -24,7 +24,7 @@ import java.util.Properties;
name = "enabled", havingValue = "true", matchIfMissing = true) name = "enabled", havingValue = "true", matchIfMissing = true)
@AutoConfigureAfter(value = {DispatchProperties.class}) @AutoConfigureAfter(value = {DispatchProperties.class})
@Slf4j @Slf4j
public class KafkaDataExporter { public class KafkaDataExporter implements DisposableBean {
KafkaProducer<Long, CollectRep.MetricsData> kafkaProducer; KafkaProducer<Long, CollectRep.MetricsData> kafkaProducer;
DispatchProperties.ExportProperties.KafkaProperties kafkaProperties; DispatchProperties.ExportProperties.KafkaProperties kafkaProperties;
@@ -52,4 +52,11 @@ public class KafkaDataExporter {
log.error("kafkaProducer is not enable"); log.error("kafkaProducer is not enable");
} }
} }
@Override
public void destroy() throws Exception {
if (kafkaProducer != null) {
kafkaProducer.close();
}
}
} }