tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more debug logging for api package config sync 

refs #10819
This commit is contained in:
Michael Friedrich 2015-12-11 17:03:07 +01:00 committed by Gunnar Beutner
parent 1f5a216a01
commit f0a1872e3b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/remote/apilistener-filesync.cpp
View File

@ -34,7 +34,17 @@ REGISTER_APIFUNCTION(Update, config, &ApiListener::ConfigUpdateHandler);
bool ApiListener::IsConfigMaster(const Zone::Ptr& zone) bool ApiListener::IsConfigMaster(const Zone::Ptr& zone)
{ {
return !ConfigCompiler::GetZoneDirs(zone->GetName()).empty(); std::vector<ZoneFragment> zoneDirs = ConfigCompiler::GetZoneDirs(zone->GetName());
std::vector<String> paths;
BOOST_FOREACH(const ZoneFragment& zf, zoneDirs) {
paths.push_back(zf.Path);
}
Log(LogNotice, "ApiListener")
<< "Registered config directories for zone '" << zone->GetName() << "': " << Utility::NaturalJoin(paths);
return zoneDirs.size() > 0;
} }
void ApiListener::ConfigGlobHandler(Dictionary::Ptr& config, const String& path, const String& file) void ApiListener::ConfigGlobHandler(Dictionary::Ptr& config, const String& path, const String& file)
@ -146,8 +156,11 @@ void ApiListener::SyncZoneDir(const Zone::Ptr& zone) const
void ApiListener::SyncZoneDirs(void) const void ApiListener::SyncZoneDirs(void) const
{ {
BOOST_FOREACH(const Zone::Ptr& zone, ConfigType::GetObjectsByType<Zone>()) { BOOST_FOREACH(const Zone::Ptr& zone, ConfigType::GetObjectsByType<Zone>()) {
if (!IsConfigMaster(zone)) if (!IsConfigMaster(zone)) {
Log(LogWarning, "ApiListener")
<< "Not syncing config update for zone '" << zone->GetName() << "' because we do not have an authoritative version of the zone's config.";
continue; continue;
}
try { try {
SyncZoneDir(zone); SyncZoneDir(zone);