From 74c83d2d5bdeb55878f1d4822fb4b844836fcc46 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 24 Jul 2015 13:21:26 +0200 Subject: [PATCH] make role accessible during cluster startup --- js/server/initialise.js | 3 +++ js/server/modules/org/arangodb/cluster.js | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/server/initialise.js b/js/server/initialise.js index be5d716c92..ab0c3d8ece 100644 --- a/js/server/initialise.js +++ b/js/server/initialise.js @@ -65,6 +65,9 @@ require("org/arangodb"); // load the actions from the actions directory require("org/arangodb/actions").startup(); +// initialize AQL +require("org/arangodb/aql"); + // ----------------------------------------------------------------------------- // --SECTION-- END-OF-FILE // ----------------------------------------------------------------------------- diff --git a/js/server/modules/org/arangodb/cluster.js b/js/server/modules/org/arangodb/cluster.js index b7fe0a85cd..f8f9dc1a84 100644 --- a/js/server/modules/org/arangodb/cluster.js +++ b/js/server/modules/org/arangodb/cluster.js @@ -879,8 +879,7 @@ var wait = function (data, shards) { //////////////////////////////////////////////////////////////////////////////// var isCluster = function () { - return (typeof global.ArangoServerState !== "undefined" && - global.ArangoServerState.initialised()); + return (typeof global.ArangoServerState !== "undefined"); }; //////////////////////////////////////////////////////////////////////////////// @@ -912,7 +911,7 @@ var role = function () { //////////////////////////////////////////////////////////////////////////////// var status = function () { - if (! isCluster()) { + if (! isCluster() || ! global.ArangoServerState.initialised()) { return undefined; } @@ -936,7 +935,7 @@ var isCoordinatorRequest = function (req) { //////////////////////////////////////////////////////////////////////////////// var handlePlanChange = function () { - if (! isCluster() || isCoordinator()) { + if (! isCluster() || isCoordinator() || ! global.ArangoServerState.initialised()) { return; }