Skip to content

Commit 4bfcf95

Browse files
committed
Make sure evicted sessions clean up state.
1 parent c87f2dc commit 4bfcf95

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

java/server/src/org/openqa/selenium/remote/server/DefaultDriverSessions.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.openqa.selenium.io.TemporaryFilesystem;
3131
import org.openqa.selenium.remote.DesiredCapabilities;
3232
import org.openqa.selenium.remote.SessionId;
33+
import org.openqa.selenium.remote.server.log.LoggingManager;
34+
import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
3335

3436
import java.util.List;
3537
import java.util.ServiceLoader;
@@ -72,7 +74,14 @@ public DefaultDriverSessions(Platform runningOn, DriverFactory factory, Clock cl
7274
registerDefaults(runningOn);
7375
registerServiceLoaders(runningOn);
7476

75-
RemovalListener<SessionId, Session> listener = notification -> notification.getValue().close();
77+
RemovalListener<SessionId, Session> listener = notification -> {
78+
Session session = notification.getValue();
79+
80+
session.close();
81+
PerSessionLogHandler logHandler = LoggingManager.perSessionLogHandler();
82+
logHandler.transferThreadTempLogsToSessionLogs(session.getSessionId());
83+
logHandler.removeSessionLogs(session.getSessionId());
84+
};
7685

7786
this.sessionIdToDriver = CacheBuilder.newBuilder()
7887
.removalListener(listener)

0 commit comments

Comments
 (0)