From a93ed1ccb48115b10038b4db3befdbfac4135751 Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Fri, 3 Jul 2026 15:29:11 +0300 Subject: [PATCH] Fix monitoring process destroy --- .../service/mode/monitoring/KafkaMonitoringService.java | 2 ++ .../mode/monitoring/SignalKafkaEventWriterService.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/KafkaMonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/KafkaMonitoringService.java index c2fe615..833c710 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/KafkaMonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/KafkaMonitoringService.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.DependsOn; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.support.Acknowledgment; import org.springframework.stereotype.Service; @@ -33,6 +34,7 @@ import java.util.stream.Collectors; @Slf4j @Service +@DependsOn(value = "signalKafkaEventWriterService") public class KafkaMonitoringService { private volatile boolean isShuttingdDown = false; private final int permits; diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/SignalKafkaEventWriterService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/SignalKafkaEventWriterService.java index af64e21..2fc15c5 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/SignalKafkaEventWriterService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/SignalKafkaEventWriterService.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; @Service public class SignalKafkaEventWriterService { private final static Charset encoding = Charset.forName("windows-1251"); - private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss"); // TODO убрать время + private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy"); private final ExecutorService executorService = Executors.newSingleThreadExecutor( new CustomizableThreadFactory("signal-kafka-event-writer-") @@ -73,7 +73,7 @@ public class SignalKafkaEventWriterService { continue; } if (event.getEventType() == EventType.STOP) { - break; + return; } if (event.getEventType() == EventType.WRITE) {