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

Fix: Cluster log files were not properly removed when an instance has no peers.

This commit is contained in:
Gunnar Beutner 2013-09-16 11:08:13 +02:00
parent 5495b0279e
commit e391fc0858
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/cluster/clustercomponent.cpp
View File

@ -519,9 +519,7 @@ void ClusterComponent::ClusterTimerHandler(void)
Array::Ptr peers = GetPeers(); Array::Ptr peers = GetPeers();
if (!peers) if (peers) {
return;
ObjectLock olock(peers); ObjectLock olock(peers);
BOOST_FOREACH(const String& peer, peers) { BOOST_FOREACH(const String& peer, peers) {
Endpoint::Ptr endpoint = Endpoint::GetByName(peer); Endpoint::Ptr endpoint = Endpoint::GetByName(peer);
@ -555,6 +553,7 @@ void ClusterComponent::ClusterTimerHandler(void)
Log(LogWarning, "cluster", msgbuf.str()); Log(LogWarning, "cluster", msgbuf.str());
} }
} }
}
std::vector<int> files; std::vector<int> files;
Utility::Glob(GetClusterDir() + "log/*", boost::bind(&ClusterComponent::LogGlobHandler, boost::ref(files), _1)); Utility::Glob(GetClusterDir() + "log/*", boost::bind(&ClusterComponent::LogGlobHandler, boost::ref(files), _1));