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

fixed tests

This commit is contained in:
Jan Steemann 2015-07-24 14:02:06 +02:00
parent dbb740a705
commit 5a393e1705
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/server/modules/org/arangodb/cluster.js
View File

@ -879,7 +879,9 @@ var wait = function (data, shards) {
////////////////////////////////////////////////////////////////////////////////
var isCluster = function () {
return (typeof global.ArangoServerState !== "undefined");
var role = global.ArangoServerState.role();
return (role !== undefined && role !== "SINGLE");
};
////////////////////////////////////////////////////////////////////////////////
@ -887,10 +889,6 @@ var isCluster = function () {
////////////////////////////////////////////////////////////////////////////////
var isCoordinator = function () {
if (! isCluster()) {
return false;
}
return global.ArangoServerState.isCoordinator();
};
@ -899,11 +897,12 @@ var isCoordinator = function () {
////////////////////////////////////////////////////////////////////////////////
var role = function () {
if (! isCluster()) {
return undefined;
}
var role = global.ArangoServerState.role();
return global.ArangoServerState.role();
if (role !== "SINGLE") {
return role;
}
return undefined;
};
////////////////////////////////////////////////////////////////////////////////