Fehler im Shutdown-Code korrigiert: Shutdown von `EndlessConsumer` zu spät

[demos/kafka/training] / src / main / java / de / juplo / kafka / Application.java

diff --git a/src/main/java/de/juplo/kafka/Application.java b/src/main/java/de/juplo/kafka/Application.java
index f227bbe..76c2520 100644 (file)
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -7,6 +7,10 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import javax.annotation.PreDestroy;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
 
 @SpringBootApplication
 @Slf4j
@@ -14,6 +18,8 @@ public class Application implements ApplicationRunner
 {
   @Autowired
   EndlessConsumer endlessConsumer;
+  @Autowired
+  ExecutorService executor;
 
 
   @Override
@@ -23,6 +29,47 @@ public class Application implements ApplicationRunner
     endlessConsumer.start();
   }
 
+  @PreDestroy
+  public void shutdown()
+  {
+    try
+    {
+      log.info("Stopping EndlessConsumer");
+      endlessConsumer.stop();
+    }
+    catch (IllegalStateException e)
+    {
+      log.info("Was already stopped: {}", e.toString());
+    }
+    catch (Exception e)
+    {
+      log.error("Unexpected exception while stopping EndlessConsumer: {}", e);
+    }
+
+    try
+    {
+      log.info("Shutting down the ExecutorService.");
+      executor.shutdown();
+      log.info("Waiting 5 seconds for the ExecutorService to terminate...");
+      executor.awaitTermination(5, TimeUnit.SECONDS);
+    }
+    catch (InterruptedException e)
+    {
+      log.error("Exception while waiting for the termination of the ExecutorService: {}", e);
+    }
+    finally
+    {
+      if (!executor.isTerminated())
+      {
+        log.warn("Forcing shutdown of ExecutorService!");
+        executor
+            .shutdownNow()
+            .forEach(runnable -> log.warn("Unprocessed task: {}", runnable.getClass().getSimpleName()));
+      }
+      log.info("Shutdow of ExecutorService finished");
+    }
+  }
+
 
   public static void main(String[] args)
   {