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

Finalise Kickstarter.

This commit is contained in:
Max Neunhoeffer 2014-02-11 09:52:32 +01:00
parent 945c80f23d
commit d168b0ff7f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,6 @@ launchActions.startServers = function (dispatchers, cmd, isRelaunch) {
"..", cmd.arangodPath )); "..", cmd.arangodPath ));
} }
} }
print(arangodPath, args);
pids.push(executeExternal(arangodPath, args)); pids.push(executeExternal(arangodPath, args));
endpoints.push(exchangePort(dispatchers[cmd.dispatcher].endpoint,port)); endpoints.push(exchangePort(dispatchers[cmd.dispatcher].endpoint,port));
} }

4
js/server/modules/org/arangodb/cluster/planner.js
View File

@ -157,13 +157,15 @@ PortFinder.prototype.next = function () {
// Check that port is available: // Check that port is available:
if (!this.dispatcher.avoidPorts.hasOwnProperty(this.port)) { if (!this.dispatcher.avoidPorts.hasOwnProperty(this.port)) {
var available = true; var available = true;
if (this.dispatcher.endpoint !== "tcp://localhost:") { if (this.dispatcher.endpoint === "tcp://localhost:") {
available = SYS_TEST_PORT("tcp://0.0.0.0:"+this.port); available = SYS_TEST_PORT("tcp://0.0.0.0:"+this.port);
} }
else { else {
var url = "http" + this.dispatcher.endpoint.substr(3) + var url = "http" + this.dispatcher.endpoint.substr(3) +
"/_admin/clusterCheckPort?port="+this.port; "/_admin/clusterCheckPort?port="+this.port;
print("Doing: ",url);
var r = download(url, "", {"method": "GET"}); var r = download(url, "", {"method": "GET"});
print("ResultCOde:", r.code);
if (r.code === 200) { if (r.code === 200) {
available = JSON.parse(r.body); available = JSON.parse(r.body);
} }