X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplication.java;h=a4d9aeb8ef5580f2c70422101ba93b33dc998289;hb=f095f71a104fcde025a63f87ba75eb5cb3136656;hp=6601e6dec42ced184105af1d6f8388ad7947f7ab;hpb=28b729e55e2e0914b06c1dcb0a5defd9bcef4933;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/Application.java b/src/main/java/de/juplo/kafka/Application.java
index 6601e6d..a4d9aeb 100644
--- a/src/main/java/de/juplo/kafka/Application.java
+++ b/src/main/java/de/juplo/kafka/Application.java
@@ -8,9 +8,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 
 
 @SpringBootApplication
@@ -19,8 +16,6 @@ public class Application implements ApplicationRunner
 {
   @Autowired
   EndlessConsumer endlessConsumer;
-  @Autowired
-  ExecutorService executor;
 
 
   @Override
@@ -31,29 +26,20 @@ public class Application implements ApplicationRunner
   }
 
   @PreDestroy
-  public void stopExecutor()
+  public void shutdown()
   {
     try
     {
-      log.info("Shutting down the ExecutorService.");
-      executor.shutdown();
-      log.info("Waiting 5 seconds for the ExecutorService to terminate...");
-      executor.awaitTermination(5, TimeUnit.SECONDS);
+      log.info("Stopping EndlessConsumer");
+      endlessConsumer.stop();
     }
-    catch (InterruptedException e)
+    catch (IllegalStateException e)
     {
-      log.error("Exception while waiting for the termination of the ExecutorService: {}", e.toString());
+      log.info("Was already stopped: {}", e.toString());
     }
-    finally
+    catch (Exception e)
     {
-      if (!executor.isShutdown())
-      {
-        log.warn("Forcing shutdown of ExecutorService!");
-        executor
-            .shutdownNow()
-            .forEach(runnable -> log.warn("Unfinished task: {}", runnable.getClass().getSimpleName()));
-      }
-      log.info("Shutdow of ExecutorService finished");
+      log.error("Unexpected exception while stopping EndlessConsumer: {}", e);
     }
   }