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 generic-col-types

This commit is contained in:
jsteemann 2016-08-30 08:18:34 +02:00
parent 89e047283b c53428ce89
commit bd590fb62d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Agency/AgentConfiguration.cpp
View File

@ -476,7 +476,7 @@ bool config_t::merge(VPackSlice const& conf) {
ss << "Min RAFT interval: ";
if (_minPing == 0) { // Command line beats persistence
if (conf.hasKey(minPingStr)) {
_minPing = conf.get(minPingStr).getNumericValue<double>();
_minPing = conf.get(minPingStr).getDouble();
ss << _minPing << " (persisted)";
} else {
_minPing = 0.5;
@ -491,7 +491,11 @@ bool config_t::merge(VPackSlice const& conf) {
ss << "Max RAFT interval: ";
if (_maxPing == 0) { // Command line beats persistence
if (conf.hasKey(maxPingStr)) {
<<<<<<< HEAD
_maxPing = conf.get(maxPingStr).getNumericValue<double>();
=======
_maxPing = conf.get(maxPingStr).getDouble();
>>>>>>> c53428ce893e1684701d8be23a894b221ad4969d
ss << _maxPing << " (persisted)";
} else {
_maxPing = 2.5;

2
arangod/RestServer/BootstrapFeature.cpp
View File

@ -136,7 +136,7 @@ void BootstrapFeature::start() {
auto vocbase = DatabaseFeature::DATABASE->systemDatabase();
auto ss = ServerState::instance();
if (!ss->isRunningInCluster() && !ss->isAgent()) {
if (!ss->isRunningInCluster()) {
LOG_TOPIC(DEBUG, Logger::STARTUP) << "Running server/server.js";
V8DealerFeature::DEALER->loadJavascript(vocbase, "server/server.js");
} else if (ss->isCoordinator()) {

3
js/server/modules/@arangodb/foxx/queues/index.js
View File

@ -24,6 +24,7 @@
// //////////////////////////////////////////////////////////////////////////////
const isCluster = require("@arangodb/cluster").isCluster();
const isAgent = global.ArangoAgent.enabled();
var _ = require('lodash');
var flatten = require('internal').flatten;
@ -231,7 +232,7 @@ function asNumber (num) {
}
function updateQueueDelayClusterAware() {
if (isCluster) {
if (isCluster && !isAgent) {
global.ArangoAgency.set('Current/FoxxmasterQueueupdate', true);
}
updateQueueDelay();