Skip to content

Commit 721a8b6

Browse files
committed
Remove Session Mgmt classes and session gauge
1 parent 12bba54 commit 721a8b6

6 files changed

Lines changed: 0 additions & 301 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package eu.openanalytics.containerproxy;
2222

2323
import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
24-
import eu.openanalytics.containerproxy.session.undertow.CustomSessionManagerFactory;
2524
import eu.openanalytics.containerproxy.util.ProxyMappingManager;
2625
import io.undertow.Handlers;
2726
import io.undertow.servlet.api.ServletSessionConfig;
@@ -105,9 +104,6 @@ public void init() {
105104
defaultCookieSerializer.setSameSite(sameSiteCookie);
106105
}
107106

108-
@Inject
109-
private CustomSessionManagerFactory customSessionManagerFactory;
110-
111107
@Bean
112108
public UndertowServletWebServerFactory servletContainer() {
113109
UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory();
@@ -123,7 +119,6 @@ public UndertowServletWebServerFactory servletContainer() {
123119
sessionConfig.setHttpOnly(true);
124120
sessionConfig.setSecure(Boolean.valueOf(environment.getProperty("server.secureCookies", "false")));
125121
info.setServletSessionConfig(sessionConfig);
126-
info.setSessionManagerFactory(customSessionManagerFactory);
127122
});
128123
try {
129124
factory.setAddress(InetAddress.getByName(environment.getProperty("proxy.bind-address", "0.0.0.0")));

src/main/java/eu/openanalytics/containerproxy/session/ISessionInformation.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/eu/openanalytics/containerproxy/session/redis/RedisSessionInformation.java

Lines changed: 0 additions & 95 deletions
This file was deleted.

src/main/java/eu/openanalytics/containerproxy/session/undertow/CustomSessionManagerFactory.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/main/java/eu/openanalytics/containerproxy/session/undertow/UndertowSessionInformation.java

Lines changed: 0 additions & 101 deletions
This file was deleted.

src/main/java/eu/openanalytics/containerproxy/stat/impl/Micrometer.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,27 @@
2222

2323
import eu.openanalytics.containerproxy.event.*;
2424
import eu.openanalytics.containerproxy.service.EventService;
25-
import eu.openanalytics.containerproxy.session.ISessionInformation;
2625
import eu.openanalytics.containerproxy.stat.IStatCollector;
2726
import io.micrometer.core.instrument.Counter;
2827
import io.micrometer.core.instrument.MeterRegistry;
2928
import io.micrometer.core.instrument.Timer;
3029
import org.springframework.context.event.EventListener;
3130
import org.springframework.core.env.Environment;
32-
import org.springframework.security.core.Authentication;
33-
import org.springframework.security.core.context.SecurityContext;
34-
import org.springframework.security.core.session.SessionDestroyedEvent;
35-
import org.springframework.security.core.userdetails.User;
3631
import org.springframework.stereotype.Component;
37-
import org.springframework.web.context.request.RequestContextHolder;
3832

3933
import javax.annotation.PostConstruct;
4034
import javax.inject.Inject;
41-
import javax.servlet.http.HttpSession;
4235
import java.io.IOException;
43-
import java.security.Principal;
4436
import java.util.concurrent.atomic.AtomicInteger;
45-
import java.util.concurrent.atomic.AtomicLong;
4637

4738
@Component
4839
public class Micrometer implements IStatCollector {
4940

5041
@Inject
5142
private MeterRegistry registry;
5243

53-
@Inject
54-
private ISessionInformation sessionInformation;
55-
5644
private AtomicInteger appsGauge;
5745

58-
private AtomicLong loggedInUsersGauge;
59-
6046
private Timer appStartupTimer;
6147

6248
private Timer appUsageTimer;
@@ -72,7 +58,6 @@ public class Micrometer implements IStatCollector {
7258
@PostConstruct
7359
public void init() {
7460
appsGauge = registry.gauge("apps", new AtomicInteger(0));
75-
loggedInUsersGauge = registry.gauge("users", new AtomicLong(0));
7661
appStartupTimer = registry.timer("startupTime");
7762
appUsageTimer = registry.timer("usageTime");
7863
appStartFailedCounter = registry.counter("startFailed");
@@ -94,14 +79,12 @@ public void accept(EventService.Event event, Environment env) throws IOException
9479
public void onUserLogoutEvent(UserLogoutEvent event) {
9580
// TODO in a HA setup this event should only be processed by one server
9681
System.out.printf("UserLogoutEvent %s, %s, %s\n", event.getUserId(), event.getSessionId(), event.getWasExpired());
97-
loggedInUsersGauge.set(sessionInformation.getLoggedInUsersCount());
9882
userLogouts.increment();
9983
}
10084

10185
@EventListener
10286
public void onUserLoginEvent(UserLoginEvent event) {
10387
System.out.printf("UserLoginEvent, %s, %s \n", event.getUserId(), event.getSessionId());
104-
loggedInUsersGauge.set(sessionInformation.getLoggedInUsersCount());
10588
userLogins.increment();
10689
}
10790

0 commit comments

Comments
 (0)