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

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

This commit is contained in:
hkernbach 2017-04-26 15:34:48 +02:00
parent 5de5ff320c f6e5d0f882
commit 235799a3b9
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Agency/AgencyFeature.cpp
View File

@ -210,11 +210,13 @@ void AgencyFeature::start() {
// Find the agency prefix:
auto feature = ApplicationServer::getFeature<ClusterFeature>("Cluster");
arangodb::consensus::Supervision::setAgencyPrefix(
if (!feature->agencyPrefix().empty()) {
arangodb::consensus::Supervision::setAgencyPrefix(
std::string("/") + feature->agencyPrefix());
arangodb::consensus::Job::agencyPrefix
= std::string("/") + feature->agencyPrefix();
arangodb::consensus::Job::agencyPrefix
= std::string("/") + feature->agencyPrefix();
}
// TODO: Port this to new options handling
std::string endpoint;

2
arangod/Agency/Supervision.cpp
View File

@ -566,7 +566,7 @@ std::string Supervision::serverHealth(std::string const& serverName) {
return status;
} catch (...) {
LOG_TOPIC(WARN, Logger::SUPERVISION)
<< "Couldn't read server health status for server " << serverName;
<< "Couldn't read server health status for server " << serverName;
return "";
}
}

2
arangod/Agency/Supervision.h
View File

@ -119,7 +119,9 @@ class Supervision : public arangodb::Thread {
}
static void setAgencyPrefix(std::string prefix) {
LOG_TOPIC(WARN, Logger::SUPERVISION) << "WTF? " << _agencyPrefix;
_agencyPrefix = prefix;
LOG_TOPIC(WARN, Logger::SUPERVISION) << "WTF? " << _agencyPrefix;
}
private: