v3 selenium server, enable -browserTimeout and -timeout (also aliased…

… to -sessionTimeout) command line arguments

delete empty test
make static final strings out of the magic strings

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

@@ -32,8 +32,8 @@ public class CommandLineArgs {
 
   @Parameter(
     names = "-browserTimeout",
-    description = "Number of seconds a browser is allowed to hang (0 means indefinite).")
-  int browserTimeout;
+    description = "Number of seconds a browser is allowed to hang (0 means indefinite) while a command is running (example: driver.get(url)). If set, must be greater than or equal to 60. When the timeout is reached while a command is processing, the session will quit.")
+  int browserTimeout = 0;
 
   @Parameter(
     names = "-jettyThreads",
@@ -46,7 +46,7 @@ public class CommandLineArgs {
   int port = 4444;
 
   @Parameter(
-    names = "-timeout",
-    description = "Number of seconds we should allow a client to be idle (0 means indefinite).")
-  int timeout;
+    names = {"-timeout", "-sessionTimeout"},
+    description = "Number of seconds we should allow a client to be idle (0 means indefinite) between commands. Session will quit when timeout is reached. Default is 1800 (30 minutes).")
+  int timeout = 1800;
 }

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

@@ -52,6 +52,8 @@
 
 public class DriverServlet extends HttpServlet {
   public static final String SESSIONS_KEY = DriverServlet.class.getName() + ".sessions";
+  public static final String SESSION_TIMEOUT_PARAMETER = "webdriver.server.session.timeout";
+  public static final String BROWSER_TIMEOUT_PARAMETER = "webdriver.server.browser.timeout";
 
   private static final String CROSS_DOMAIN_RPC_PATH = "/xdrpc";
 
@@ -81,8 +83,8 @@ public void init() throws ServletException {
     DriverSessions driverSessions = sessionsSupplier.get();
     commandHandler = new JsonHttpCommandHandler(driverSessions, logger);
 
-    long sessionTimeOutInMs = getValueToUseInMs("webdriver.server.session.timeout", 1800);
-    long browserTimeoutInMs = getValueToUseInMs("webdriver.server.browser.timeout", 0);
+    long sessionTimeOutInMs = getValueToUseInMs(SESSION_TIMEOUT_PARAMETER, 1800);
+    long browserTimeoutInMs = getValueToUseInMs(BROWSER_TIMEOUT_PARAMETER, 0);
 
     if (sessionTimeOutInMs > 0 || browserTimeoutInMs > 0) {
       createSessionCleaner(logger, driverSessions, sessionTimeOutInMs, browserTimeoutInMs);

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

@@ -41,6 +41,8 @@ public class SeleniumServer implements GridNodeServer {
   private int threadCount;
   private Server server;
   private DefaultDriverSessions driverSessions;
+  private int browserTimeout = 0;
+  private int sessionTimeout = 0;
 
   private Thread shutDownHook;
   /**
@@ -70,10 +72,18 @@ private void addRcSupport(ServletContextHandler handler) {
     }
   }
 
-  private void setThreadCount(int threadCount) {
+  public void setThreadCount(int threadCount) {
     this.threadCount = threadCount;
   }
 
+  public void setBrowserTimeout(int browserTimeout) {
+    this.browserTimeout = browserTimeout;
+  }
+
+  public void setSessionTimeout(int timeout) {
+    this.sessionTimeout = timeout;
+  }
+
   public void boot() {
     if (threadCount > 0) {
       server = new Server(new QueuedThreadPool(threadCount));
@@ -87,6 +97,14 @@ public void boot() {
     handler.setAttribute(DriverServlet.SESSIONS_KEY, driverSessions);
     handler.setContextPath("/");
     handler.addServlet(DriverServlet.class, "/wd/hub/*");
+
+    if (browserTimeout > 0) {
+      handler.setInitParameter(DriverServlet.BROWSER_TIMEOUT_PARAMETER, String.valueOf(browserTimeout));
+    }
+    if (sessionTimeout > 0) {
+      handler.setInitParameter(DriverServlet.SESSION_TIMEOUT_PARAMETER, String.valueOf(sessionTimeout));
+    }
+
     addRcSupport(handler);
 
     server.setHandler(handler);
@@ -191,6 +209,8 @@ public static void main(String[] argv) {
 
     SeleniumServer server = new SeleniumServer(args.port);
     server.setThreadCount(args.jettyThreads);
+    server.setBrowserTimeout(args.browserTimeout);
+    server.setSessionTimeout(args.timeout);
     server.boot();
   }
 

java/server/src/org/openqa/selenium/server/SeleniumServer.java

@@ -411,8 +411,8 @@ private HttpContext createWebDriverRemoteContext(DriverSessions webDriverSession
     } else {
       browserTimeout /= 1000;
     }
-    webdriverContext.setInitParameter("webdriver.server.session.timeout", String.valueOf(sessionTimeout));
-    webdriverContext.setInitParameter("webdriver.server.browser.timeout", String.valueOf(browserTimeout));
+    webdriverContext.setInitParameter(DriverServlet.SESSION_TIMEOUT_PARAMETER, String.valueOf(sessionTimeout));
+    webdriverContext.setInitParameter(DriverServlet.BROWSER_TIMEOUT_PARAMETER, String.valueOf(browserTimeout));
     webdriverContext.setAttribute(DriverServlet.SESSIONS_KEY, webDriverSessions);
     webdriverContext.setContextPath("/wd");
     ServletHandler handler = new ServletHandler();