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

Build fix for RHEL 5.3

This commit is contained in:
Gunnar Beutner 2012-05-09 13:49:26 +02:00
parent 68a4eadb54
commit 42881d4b8a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/discovery/discoverycomponent.cpp
View File

@ -573,14 +573,17 @@ int DiscoveryComponent::DiscoveryTimerHandler(const TimerEventArgs& tea)
ConfigCollection::Ptr endpointCollection = GetApplication()->GetConfigHive()->GetCollection("endpoint"); ConfigCollection::Ptr endpointCollection = GetApplication()->GetConfigHive()->GetCollection("endpoint");
endpointCollection->ForEachObject(bind(&DiscoveryComponent::EndpointConfigHandler, this, _1)); endpointCollection->ForEachObject(bind(&DiscoveryComponent::EndpointConfigHandler, this, _1));
map<string, ComponentDiscoveryInfo::Ptr>::iterator i; map<string, ComponentDiscoveryInfo::Ptr>::iterator curr, i;
for (i = m_Components.begin(); i != m_Components.end(); ) { for (i = m_Components.begin(); i != m_Components.end(); ) {
string identity = i->first; string identity = i->first;
ComponentDiscoveryInfo::Ptr info = i->second; ComponentDiscoveryInfo::Ptr info = i->second;
curr = i;
i++;
if (info->LastSeen < now - DiscoveryComponent::RegistrationTTL) { if (info->LastSeen < now - DiscoveryComponent::RegistrationTTL) {
/* unregister this component if its registration has expired */ /* unregister this component if its registration has expired */
i = m_Components.erase(i); m_Components.erase(curr);
continue; continue;
} }
@ -599,8 +602,6 @@ int DiscoveryComponent::DiscoveryTimerHandler(const TimerEventArgs& tea)
/* try and reconnect to this component */ /* try and reconnect to this component */
endpointManager->AddConnection(info->Node, info->Service); endpointManager->AddConnection(info->Node, info->Service);
} }
i++;
} }
return 0; return 0;