Skip to content

Commit 545fba4

Browse files
committed
Fixing timeout issue in the Grid.
1 parent e1c317c commit 545fba4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public BaseRemoteProxy(RegistrationRequest request, Registry registry) {
144144

145145
maxConcurrentSession = getConfigInteger(RegistrationRequest.MAX_SESSION);
146146
cleanUpCycle = getConfigInteger(RegistrationRequest.CLEAN_UP_CYCLE);
147-
timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT);
147+
timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT) * 1000;
148148
statusCheckTimeout = getConfigInteger(RegistrationRequest.STATUS_CHECK_TIMEOUT);
149149

150150
List<DesiredCapabilities> capabilities = request.getCapabilities();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,8 @@ public static RemoteControlConfiguration parseLauncherOptions(String[] args) {
10221022
configuration.setDebugURL(getArg(args, ++i));
10231023
} else if ("-timeout".equalsIgnoreCase(arg)) {
10241024
configuration.setTimeoutInSeconds(Integer.parseInt(getArg(args, ++i)));
1025+
} else if ("-browserTimeout".equalsIgnoreCase(arg)) {
1026+
configuration.setBrowserTimeoutInMs(Integer.parseInt(getArg(args, ++i)));
10251027
} else if ("-jettyThreads".equalsIgnoreCase(arg)) {
10261028
int jettyThreadsCount = Integer.parseInt(getArg(args, ++i));
10271029

0 commit comments

Comments
 (0)