Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-05-06 11:00:51 +02:00
parent e93225d7f5 23739df0aa
commit 712967108a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/server/modules/org/arangodb/cluster/kickstarter.js
View File

@ -417,7 +417,11 @@ launchActions.startServers = function (dispatchers, cmd, isRelaunch) {
var error = false; var error = false;
for (i = 0;i < endpoints.length;i++) { for (i = 0;i < endpoints.length;i++) {
if (! waitForServerUp(endpoints[i], 50)) { var timeout = 50;
if (cmd.valgrind !== '') {
timeout *= 1000;
}
if (! waitForServerUp(endpoints[i], timeout)) {
error = true; error = true;
} }
} }