Clean up session logs in the same way as we used to

kumagi · Jun 23, 2017 · 4e477eb · 4e477eb
1 parent 2d69139
commit 4e477eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/ActiveSessions.java b/java/server/src/org/openqa/selenium/remote/server/ActiveSessions.java
@@ -17,13 +17,13 @@
 
 package org.openqa.selenium.remote.server;
 
-import static java.util.concurrent.TimeUnit.MINUTES;
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
 
 import org.openqa.selenium.remote.SessionId;
+import org.openqa.selenium.remote.server.log.LoggingManager;
+import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
 
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -42,6 +42,10 @@ public ActiveSessions(long inactiveSessionTimeout, TimeUnit unit) {
       log("Removing session %s: %s", notification.getKey(), notification.getCause());
       ActiveSession session = notification.getValue();
       session.stop();
+
+      PerSessionLogHandler logHandler = LoggingManager.perSessionLogHandler();
+      logHandler.transferThreadTempLogsToSessionLogs(session.getId());
+      logHandler.removeSessionLogs(session.getId());
     };
 
     allSessions = CacheBuilder.newBuilder()

diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -89,6 +89,7 @@ java_library(
     ':server',
     ':sessions',
     '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/server/src/org/openqa/selenium/remote/server/log:log',
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
   ],