import org.springframework.boot.autoconfigure.SpringBootApplication;
import javax.annotation.PreDestroy;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
@SpringBootApplication
{
@Autowired
EndlessConsumer endlessConsumer;
- @Autowired
- ExecutorService executor;
@Override
}
@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.isTerminated())
- {
- log.warn("Forcing shutdown of ExecutorService!");
- executor
- .shutdownNow()
- .forEach(runnable -> log.warn("Unprocessed task: {}", runnable.getClass().getSimpleName()));
- }
- log.info("Shutdow of ExecutorService finished");
+ log.error("Unexpected exception while stopping EndlessConsumer: {}", e);
}
}