Add fallback

Author: marcosbarbero

src/main/java/com/marcosbarbero/wd/gracefulshutdown/GracefulShutdown.java

@@ -15,6 +15,8 @@ final class GracefulShutdown implements TomcatConnectorCustomizer, ApplicationLi
 
     private static final Logger log = LoggerFactory.getLogger(GracefulShutdown.class);
 
+    private static final int TIMEOUT = 30;
+
     private volatile Connector connector;
 
     @Override
@@ -30,9 +32,15 @@ public void onApplicationEvent(ContextClosedEvent event) {
             try {
                 ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) executor;
                 threadPoolExecutor.shutdown();
-                if (!threadPoolExecutor.awaitTermination(30, TimeUnit.SECONDS)) {
+                if (!threadPoolExecutor.awaitTermination(TIMEOUT, TimeUnit.SECONDS)) {
                     log.warn("Tomcat thread pool did not shut down gracefully within "
-                            + "30 seconds. Proceeding with forceful shutdown");
+                            + TIMEOUT + " seconds. Proceeding with forceful shutdown");
+
+                    threadPoolExecutor.shutdownNow();
+
+                    if (!threadPoolExecutor.awaitTermination(TIMEOUT, TimeUnit.SECONDS)) {
+                        log.error("Tomcat thread pool did not terminate");
+                    }
                 }
             } catch (InterruptedException ex) {
                 Thread.currentThread().interrupt();