Merge pull request 'Fix #18198: extend the lifetime of the session when a websocket connection is active' (#54) from feature/18198_final into develop

LGTM

Author: fmichielssen

src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java

@@ -21,6 +21,9 @@
 package eu.openanalytics.containerproxy;
 
 import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
+import eu.openanalytics.containerproxy.service.hearbeat.ActiveProxiesService;
+import eu.openanalytics.containerproxy.service.hearbeat.HeartbeatService;
+import eu.openanalytics.containerproxy.service.hearbeat.SessionReActivatorService;
 import eu.openanalytics.containerproxy.util.ProxyMappingManager;
 import io.undertow.Handlers;
 import io.undertow.server.handlers.SameSiteCookieHandler;
@@ -42,6 +45,8 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
 import org.springframework.session.FindByIndexNameSessionRepository;
@@ -56,9 +61,12 @@
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
+@EnableAsync
 @SpringBootApplication
 @ComponentScan("eu.openanalytics")
 public class ContainerProxyApplication {
@@ -199,6 +207,20 @@ public HttpSessionEventPublisher httpSessionEventPublisher() {
 		return new HttpSessionEventPublisher();
 	}
 
+	@Bean
+	public Executor taskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.setCorePoolSize(2);
+		executor.setMaxPoolSize(4);
+		executor.initialize();
+		return executor;
+	}
+
+	@Bean
+	public HeartbeatService heartbeatService(ActiveProxiesService activeProxiesService, SessionReActivatorService sessionReActivatorService) {
+		return new HeartbeatService(Arrays.asList(activeProxiesService, sessionReActivatorService));
+	}
+
 	public static Properties getDefaultProperties() {
 		Properties properties = new Properties();
 

src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java

@@ -23,6 +23,7 @@
 import javax.inject.Inject;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import eu.openanalytics.containerproxy.backend.strategy.IProxyLogoutStrategy;

src/main/java/eu/openanalytics/containerproxy/event/UserLogoutEvent.java

@@ -33,7 +33,7 @@ public class UserLogoutEvent extends ApplicationEvent {
      * @param source
      * @param userId
      * @param sessionId
-     * @param wasExpired whether the user is logged autoamtically because the session has expired
+     * @param wasExpired whether the user is logged automatically because the session has expired
      */
     public UserLogoutEvent(Object source, String userId, String sessionId, Boolean wasExpired) {
         super(source);

src/main/java/eu/openanalytics/containerproxy/service/AppRecoveryService.java

@@ -31,6 +31,7 @@
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.UserIdKey;
 import eu.openanalytics.containerproxy.model.spec.ContainerSpec;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
+import eu.openanalytics.containerproxy.service.hearbeat.HeartbeatService;
 import eu.openanalytics.containerproxy.spec.IProxySpecProvider;
 import eu.openanalytics.containerproxy.spec.expression.ExpressionAwareContainerSpec;
 import eu.openanalytics.containerproxy.spec.expression.SpecExpressionResolver;
@@ -139,7 +140,7 @@ public void recoverRunningApps() throws Exception {
 
 			for (Proxy proxy: proxies.values()) {
 				proxyService.addExistingProxy(proxy);
-				heartbeatService.heartbeatReceived(proxy);
+				heartbeatService.heartbeatReceived(HeartbeatService.HeartbeatSource.INTERNAL, proxy.getId(), null);
 			}
 
 		} else {