From eb4ca24e039d8fc896cfcf84470623b20cfd56fe Mon Sep 17 00:00:00 2001 From: wheleph Date: Thu, 16 Feb 2017 16:35:20 +0100 Subject: [PATCH 1/2] Set proper GRID TIMEOUT value --- Hub/Dockerfile | 2 +- Hub/Dockerfile.txt | 2 +- Hub/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 24f55bd9d1..f8b4c880d0 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -16,7 +16,7 @@ ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1 ENV GRID_JETTY_MAX_THREADS -1 ENV GRID_NODE_POLLING 5000 ENV GRID_CLEAN_UP_CYCLE 5000 -ENV GRID_TIMEOUT 30000 +ENV GRID_TIMEOUT 30 ENV GRID_BROWSER_TIMEOUT 0 ENV GRID_MAX_SESSION 5 ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000 diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt index 56bd474d61..01ae1f49da 100644 --- a/Hub/Dockerfile.txt +++ b/Hub/Dockerfile.txt @@ -11,7 +11,7 @@ ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1 ENV GRID_JETTY_MAX_THREADS -1 ENV GRID_NODE_POLLING 5000 ENV GRID_CLEAN_UP_CYCLE 5000 -ENV GRID_TIMEOUT 30000 +ENV GRID_TIMEOUT 30 ENV GRID_BROWSER_TIMEOUT 0 ENV GRID_MAX_SESSION 5 ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000 diff --git a/Hub/README.md b/Hub/README.md index 74b959511f..ff79a2f4cb 100644 --- a/Hub/README.md +++ b/Hub/README.md @@ -16,7 +16,7 @@ Note: You can optionally override default configuration settings using environme See the [Hub's Dockerfile](Dockerfile) to view the list of variables and their default values. ``` -$ docker run -d -P --name selenium-hub -e GRID_TIMEOUT=10000 selenium/hub +$ docker run -d -P --name selenium-hub -e GRID_TIMEOUT=10 selenium/hub ``` From 58568ee460747b37490284e3b7b55edf0ee69509 Mon Sep 17 00:00:00 2001 From: wheleph Date: Thu, 16 Feb 2017 16:35:49 +0100 Subject: [PATCH 2/2] Add comment about time units used in environment variables --- Hub/Dockerfile.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hub/Dockerfile.txt b/Hub/Dockerfile.txt index 01ae1f49da..da4ac1b2e6 100644 --- a/Hub/Dockerfile.txt +++ b/Hub/Dockerfile.txt @@ -7,13 +7,19 @@ MAINTAINER Selenium EXPOSE 4444 ENV GRID_THROW_ON_CAPABILITY_NOT_PRESENT true +# In milliseconds ENV GRID_NEW_SESSION_WAIT_TIMEOUT -1 ENV GRID_JETTY_MAX_THREADS -1 +# In milliseconds ENV GRID_NODE_POLLING 5000 +# In milliseconds ENV GRID_CLEAN_UP_CYCLE 5000 +# In seconds ENV GRID_TIMEOUT 30 +# In seconds ENV GRID_BROWSER_TIMEOUT 0 ENV GRID_MAX_SESSION 5 +# In milliseconds ENV GRID_UNREGISTER_IF_STILL_DOWN_AFTER 30000 COPY generate_config /opt/selenium/generate_config