Skip to content

Allow configuring default maxIdleTime on InMemoryWebSessionStore. #35866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −3
Open

Allow configuring default maxIdleTime on InMemoryWebSessionStore. #35866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
*
* @author Rossen Stoyanchev
* @author Rob Winch
* @author Mengqi Xu
* @since 5.0
*/
public class InMemoryWebSessionStore implements WebSessionStore {
Expand All @@ -51,6 +52,8 @@ public class InMemoryWebSessionStore implements WebSessionStore {

private int maxSessions = 10000;

private Duration defaultMaxIdleTime = Duration.ofMinutes(30);

private Clock clock = Clock.system(ZoneId.of("GMT"));

private final Map<String, InMemoryWebSession> sessions = new ConcurrentHashMap<>();
Expand Down Expand Up @@ -78,6 +81,23 @@ public int getMaxSessions() {
return this.maxSessions;
}

/**
* Set the default maximum idle time for sessions.
* <p>By default, set to 30 minutes.
* @param maxIdleTime the default max idle time
*/
public void setDefaultMaxIdleTime(Duration maxIdleTime) {
Assert.notNull(maxIdleTime, "maxIdleTime is required");
this.defaultMaxIdleTime = maxIdleTime;
}

/**
* Return the default maximum idle time for sessions.
*/
public Duration getDefaultMaxIdleTime() {
return this.defaultMaxIdleTime;
}

/**
* Configure the {@link Clock} to use to set the {@code lastAccessTime} on
* every created session and to calculate if the session has expired.
Expand Down Expand Up @@ -119,7 +139,7 @@ public Mono<WebSession> createWebSession() {
Instant now = this.clock.instant();
this.expiredSessionChecker.checkIfNecessary(now);

return Mono.<WebSession>fromSupplier(() -> new InMemoryWebSession(now))
return Mono.<WebSession>fromSupplier(() -> new InMemoryWebSession(now, this.defaultMaxIdleTime))
.subscribeOn(Schedulers.boundedElastic())
.publishOn(Schedulers.parallel());
}
Expand Down Expand Up @@ -180,14 +200,15 @@ private class InMemoryWebSession implements WebSession {

private volatile Instant lastAccessTime;

private volatile Duration maxIdleTime = Duration.ofMinutes(30);
private volatile Duration maxIdleTime;

private final AtomicReference<State> state = new AtomicReference<>(State.NEW);


public InMemoryWebSession(Instant creationTime) {
public InMemoryWebSession(Instant creationTime, Duration maxIdleTime) {
this.creationTime = creationTime;
this.lastAccessTime = this.creationTime;
this.maxIdleTime = maxIdleTime;
}

@Override
Expand Down