Fixed stopping EI instances in Tomcat issue. (#267)

* Fixed stopping EI instances in Tomcat issue.

* Added a predestruct annotation function that closes the MongdbHandler MongoDb connection.

* Removed scheduled annotations in App class to resolve a hanging thread in tomcat.

* Fixed so Waitlist worker TaskScheduler closes all threads.

* Made Schedule task executor thread pool size configurable.

Author: tobiasake

src/main/java/com/ericsson/ei/App.java

@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -28,24 +30,37 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.SimpleThreadScope;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
-
-import com.ericsson.ei.config.CheckEIConfigurations;
-import com.ericsson.ei.rules.RulesHandler;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
 
 @SpringBootApplication
 @EnableAsync
 @EnableScheduling
-public class App extends SpringBootServletInitializer {
+public class App extends SpringBootServletInitializer implements SchedulingConfigurer {
+    
+    @Autowired
+    Environment env;
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return application.sources(App.class);
     }
+    
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.setScheduler(taskExecutor());
+    }
+
+    @Bean(destroyMethod="shutdown")
+    public Executor taskExecutor() {
+        return Executors.newScheduledThreadPool(Integer.parseInt(env.getProperty("scheduled.threadpool.size")));
+    }
 
     public static void main(String[] args) {
 

src/main/java/com/ericsson/ei/mongodbhandler/MongoDBHandler.java

@@ -19,6 +19,7 @@
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
@@ -65,6 +66,11 @@ public class MongoDBHandler {
     public void init() {
         createConnection();
     }
+    
+    @PreDestroy
+    public void close() {
+        mongoClient.close();
+    }
 
     // Establishing the connection to mongodb and creating a collection
     private void createConnection() {

src/main/java/com/ericsson/ei/waitlist/WaitListWorker.java

@@ -59,11 +59,6 @@ public class WaitListWorker {
     @Autowired
     private EventToObjectMapHandler eventToObjectMapHandler;
 
-    @Bean
-    public TaskScheduler taskScheduler() {
-        return new ConcurrentTaskScheduler();
-    }
-
     @Scheduled(initialDelayString = "${waitlist.initialDelayResend}", fixedRateString = "${waitlist.fixedRateResend}")
     public void run() {
         List<String> documents = waitListStorageHandler.getWaitList();

src/main/resources/application.properties

@@ -95,6 +95,11 @@ testaggregated.enabled: false
 threads.corePoolSize: 100
 threads.queueCapacity: 5000
 threads.maxPoolSize: 150
+
+# WaitList-worker and Scheduling task executor thread settings
+scheduled.threadpool.size: 100
+
+
 # name of the collection where missed notifications are stored
 missedNotificationCollectionName: Notification
 # name of the database where missed notifications are stored