[grid] Removing Regularly from HandleSession

Author: diemol

java/src/org/openqa/selenium/grid/router/HandleSession.java

@@ -17,13 +17,21 @@
 
 package org.openqa.selenium.grid.router;
 
+import static org.openqa.selenium.remote.HttpSessionId.getSessionId;
+import static org.openqa.selenium.remote.RemoteTags.SESSION_ID;
+import static org.openqa.selenium.remote.RemoteTags.SESSION_ID_EVENT;
+import static org.openqa.selenium.remote.http.Contents.asJson;
+import static org.openqa.selenium.remote.tracing.Tags.EXCEPTION;
+import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
+import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST_EVENT;
+import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
+
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
 import com.google.common.collect.ImmutableMap;
 
 import org.openqa.selenium.NoSuchSessionException;
-import org.openqa.selenium.concurrent.Regularly;
 import org.openqa.selenium.grid.data.Session;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.web.ReverseProxyHandler;
@@ -47,15 +55,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
-
-import static org.openqa.selenium.remote.HttpSessionId.getSessionId;
-import static org.openqa.selenium.remote.RemoteTags.SESSION_ID;
-import static org.openqa.selenium.remote.RemoteTags.SESSION_ID_EVENT;
-import static org.openqa.selenium.remote.http.Contents.asJson;
-import static org.openqa.selenium.remote.tracing.Tags.EXCEPTION;
-import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
-import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST_EVENT;
-import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 class HandleSession implements HttpHandler {
 
@@ -77,8 +79,16 @@ class HandleSession implements HttpHandler {
       .removalListener((RemovalListener<URL, HttpClient>) removal -> removal.getValue().close())
       .build();
 
-    new Regularly("Clean up http clients cache").submit(
-      httpClients::cleanUp, Duration.ofMinutes(1), Duration.ofMinutes(1));
+    ScheduledExecutorService cleanUpHttpClientsCacheService =
+      Executors.newSingleThreadScheduledExecutor(
+        r -> {
+          Thread thread = new Thread(r);
+          thread.setDaemon(true);
+          thread.setName("HandleSession - Clean up http clients cache");
+          return thread;
+        });
+    cleanUpHttpClientsCacheService.scheduleAtFixedRate(
+      httpClients::cleanUp, 1, 1, TimeUnit.MINUTES);
   }
 
   @Override