tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-11-04 05:34:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert 78215843 as it requires Boost version 1.43.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-07-17 19:19:03 +02:00
parent f6c95efa45
commit a224c20a30
10 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/application.cpp
View File

@ -61,7 +61,8 @@ Application::~Application(void)
m_ShuttingDown = true; m_ShuttingDown = true;
/* stop all components */ /* stop all components */
BOOST_FOREACH(const Component::Ptr& component, m_Components | map_values) { Component::Ptr component;
BOOST_FOREACH(tie(tuples::ignore, component), m_Components) {
component->Stop(); component->Stop();
} }

6
base/i2-base.h
View File

@ -124,8 +124,6 @@ using std::type_info;
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/range.hpp>
#include <boost/range/adaptor/map.hpp>
using boost::shared_ptr; using boost::shared_ptr;
using boost::weak_ptr; using boost::weak_ptr;
@ -139,8 +137,8 @@ using boost::mutex;
using boost::condition_variable; using boost::condition_variable;
using boost::system_time; using boost::system_time;
using boost::tie; using boost::tie;
using boost::adaptors::map_keys;
using boost::adaptors::map_values; namespace tuples = boost::tuples;
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
# pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma GCC diagnostic ignored "-Wdeprecated-declarations"

3
base/process.cpp
View File

@ -66,7 +66,8 @@ void Process::WorkerThreadProc(void)
FD_ZERO(&readfds); FD_ZERO(&readfds);
BOOST_FOREACH(int fd, tasks | map_keys) { int fd;
BOOST_FOREACH(tie(fd, tuples::ignore), tasks) {
if (fd > nfds) if (fd > nfds)
nfds = fd; nfds = fd;

9
cib/host.cpp
View File

@ -69,7 +69,8 @@ set<string> Host::GetParents(void) const
if (GetProperty("dependencies", &dependencies)) { if (GetProperty("dependencies", &dependencies)) {
dependencies = Service::ResolveDependencies(*this, dependencies); dependencies = Service::ResolveDependencies(*this, dependencies);
BOOST_FOREACH(const Variant& dependency, dependencies | map_values) { Variant dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
Service service = Service::GetByName(dependency); Service service = Service::GetByName(dependency);
string parent = service.GetHost().GetName(); string parent = service.GetHost().GetName();
@ -98,7 +99,8 @@ bool Host::IsReachable(void) const
if (GetProperty("dependencies", &dependencies)) { if (GetProperty("dependencies", &dependencies)) {
dependencies = Service::ResolveDependencies(*this, dependencies); dependencies = Service::ResolveDependencies(*this, dependencies);
BOOST_FOREACH(const Variant& dependency, dependencies | map_values) { Variant dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
Service service = Service::GetByName(dependency); Service service = Service::GetByName(dependency);
if (!service.IsReachable() || if (!service.IsReachable() ||
@ -117,7 +119,8 @@ bool Host::IsUp(void) const
if (GetProperty("hostchecks", &hostchecks)) { if (GetProperty("hostchecks", &hostchecks)) {
hostchecks = Service::ResolveDependencies(*this, hostchecks); hostchecks = Service::ResolveDependencies(*this, hostchecks);
BOOST_FOREACH(const Variant& hostcheck, hostchecks | map_values) { Variant hostcheck;
BOOST_FOREACH(tie(tuples::ignore, hostcheck), hostchecks) {
Service service = Service::GetByName(hostcheck); Service service = Service::GetByName(hostcheck);
if (service.GetState() != StateOK && service.GetState() != StateWarning) { if (service.GetState() != StateOK && service.GetState() != StateWarning) {

12
cib/service.cpp
View File

@ -117,7 +117,8 @@ void Service::GetDependenciesRecursive(const Dictionary::Ptr& result) const {
if (!dependencies) if (!dependencies)
return; return;
BOOST_FOREACH(const Variant& dependency, dependencies | map_values) { Variant dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
if (result->Contains(dependency)) if (result->Contains(dependency))
continue; continue;
@ -147,7 +148,8 @@ bool Service::IsReachable(void) const
Dictionary::Ptr dependencies = boost::make_shared<Dictionary>(); Dictionary::Ptr dependencies = boost::make_shared<Dictionary>();
GetDependenciesRecursive(dependencies); GetDependenciesRecursive(dependencies);
BOOST_FOREACH(const Variant& dependency, dependencies | map_values) { Variant dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
Service service = Service::GetByName(dependency); Service service = Service::GetByName(dependency);
/* ignore ourselves */ /* ignore ourselves */
@ -382,7 +384,8 @@ bool Service::IsAllowedChecker(const string& checker) const
if (!checkers) if (!checkers)
return true; return true;
BOOST_FOREACH(const Variant& pattern, checkers | map_values) { Variant pattern;
BOOST_FOREACH(tie(tuples::ignore, pattern), checkers) {
if (Utility::Match(pattern, checker)) if (Utility::Match(pattern, checker))
return true; return true;
} }
@ -397,7 +400,8 @@ Dictionary::Ptr Service::ResolveDependencies(Host host, const Dictionary::Ptr& d
Dictionary::Ptr result = boost::make_shared<Dictionary>(); Dictionary::Ptr result = boost::make_shared<Dictionary>();
BOOST_FOREACH(const Variant& dependency, dependencies | map_values) { Variant dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
string name; string name;
if (services && services->Contains(dependency)) if (services && services->Contains(dependency))

11
components/compat/compatcomponent.cpp
View File

@ -233,14 +233,16 @@ void CompatComponent::StatusTimerHandler(void)
ConfigObject::TMap::Range range; ConfigObject::TMap::Range range;
range = ConfigObject::GetObjects("host"); range = ConfigObject::GetObjects("host");
BOOST_FOREACH(const ConfigObject::Ptr& object, range | map_values) { ConfigObject::Ptr object;
BOOST_FOREACH(tie(tuples::ignore, object), range) {
Host host = object; Host host = object;
Dictionary::Ptr dict; Dictionary::Ptr dict;
dict = host.GetGroups(); dict = host.GetGroups();
if (dict) { if (dict) {
BOOST_FOREACH(const Variant& hostgroup, dict | map_values) { Variant hostgroup;
BOOST_FOREACH(tie(tuples::ignore, hostgroup), dict) {
hostgroups[hostgroup].push_back(host.GetName()); hostgroups[hostgroup].push_back(host.GetName());
} }
} }
@ -276,7 +278,7 @@ void CompatComponent::StatusTimerHandler(void)
map<string, vector<Service> > servicegroups; map<string, vector<Service> > servicegroups;
BOOST_FOREACH(const ConfigObject::Ptr& object, range | map_values) { BOOST_FOREACH(tie(tuples::ignore, object), range) {
Service service = object; Service service = object;
Dictionary::Ptr dict; Dictionary::Ptr dict;
@ -284,7 +286,8 @@ void CompatComponent::StatusTimerHandler(void)
dict = service.GetGroups(); dict = service.GetGroups();
if (dict) { if (dict) {
BOOST_FOREACH(const Variant& servicegroup, dict | map_values) { Variant servicegroup;
BOOST_FOREACH(tie(tuples::ignore, servicegroup), dict) {
servicegroups[servicegroup].push_back(service); servicegroups[servicegroup].push_back(service);
} }
} }

6
components/convenience/conveniencecomponent.cpp
View File

@ -150,7 +150,8 @@ void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
} }
if (oldServices) { if (oldServices) {
BOOST_FOREACH(const ConfigItem::Ptr& service, oldServices | map_values) { ConfigItem::Ptr service;
BOOST_FOREACH(tie(tuples::ignore, service), oldServices) {
if (!newServices->Contains(service->GetName())) if (!newServices->Contains(service->GetName()))
service->Unregister(); service->Unregister();
} }
@ -175,7 +176,8 @@ void ConvenienceComponent::HostRemovedHandler(const ConfigItem::Ptr& item)
if (!services) if (!services)
return; return;
BOOST_FOREACH(const ConfigItem::Ptr& service, services | map_values) { ConfigItem::Ptr service;
BOOST_FOREACH(tie(tuples::ignore, service), services) {
service->Unregister(); service->Unregister();
} }
} }

5
components/delegation/delegationcomponent.cpp
View File

@ -275,12 +275,13 @@ void DelegationComponent::DelegationTimerHandler(void)
if (delegated > 0) { if (delegated > 0) {
if (need_clear) { if (need_clear) {
BOOST_FOREACH(const Endpoint::Ptr& endpoint, histogram | map_keys) { Endpoint::Ptr endpoint;
BOOST_FOREACH(tie(endpoint, tuples::ignore), histogram) {
ClearServices(endpoint); ClearServices(endpoint);
} }
} }
BOOST_FOREACH(const Service& service, services) { BOOST_FOREACH(Service& service, services) {
string checker = service.GetChecker(); string checker = service.GetChecker();
Endpoint::Ptr endpoint = EndpointManager::GetInstance()->GetEndpointByIdentity(checker); Endpoint::Ptr endpoint = EndpointManager::GetInstance()->GetEndpointByIdentity(checker);

23
components/discovery/discoverycomponent.cpp
View File

@ -168,11 +168,11 @@ void DiscoveryComponent::NewEndpointHandler(const Endpoint::Ptr& endpoint)
// register published/subscribed topics for this endpoint // register published/subscribed topics for this endpoint
ComponentDiscoveryInfo::Ptr info = ic->second; ComponentDiscoveryInfo::Ptr info = ic->second;
BOOST_FOREACH(const string& publication, info->Publications) { BOOST_FOREACH(string publication, info->Publications) {
endpoint->RegisterPublication(publication); endpoint->RegisterPublication(publication);
} }
BOOST_FOREACH(const string& subscription, info->Subscriptions) { BOOST_FOREACH(string subscription, info->Subscriptions) {
endpoint->RegisterSubscription(subscription); endpoint->RegisterSubscription(subscription);
} }
@ -301,14 +301,14 @@ void DiscoveryComponent::SendDiscoveryMessage(const string& method, const string
set<string>::iterator i; set<string>::iterator i;
Dictionary::Ptr subscriptions = boost::make_shared<Dictionary>(); Dictionary::Ptr subscriptions = boost::make_shared<Dictionary>();
BOOST_FOREACH(const string &subscription, info->Subscriptions) { BOOST_FOREACH(string subscription, info->Subscriptions) {
subscriptions->Add(subscription); subscriptions->Add(subscription);
} }
params.SetSubscriptions(subscriptions); params.SetSubscriptions(subscriptions);
Dictionary::Ptr publications = boost::make_shared<Dictionary>(); Dictionary::Ptr publications = boost::make_shared<Dictionary>();
BOOST_FOREACH(const string& publication, info->Publications) { BOOST_FOREACH(string publication, info->Publications) {
publications->Add(publication); publications->Add(publication);
} }
@ -327,12 +327,14 @@ bool DiscoveryComponent::HasMessagePermission(const Dictionary::Ptr& roles, cons
ConfigObject::TMap::Range range = ConfigObject::GetObjects("role"); ConfigObject::TMap::Range range = ConfigObject::GetObjects("role");
BOOST_FOREACH(const ConfigObject::Ptr& role, range | map_values) { ConfigObject::Ptr role;
BOOST_FOREACH(tie(tuples::ignore, role), range) {
Dictionary::Ptr permissions; Dictionary::Ptr permissions;
if (!role->GetProperty(messageType, &permissions)) if (!role->GetProperty(messageType, &permissions))
continue; continue;
BOOST_FOREACH(const Variant& permission, permissions | map_values) { Variant permission;
BOOST_FOREACH(tie(tuples::ignore, permission), permissions) {
if (Utility::Match(permission, message)) if (Utility::Match(permission, message))
return true; return true;
} }
@ -376,7 +378,8 @@ void DiscoveryComponent::ProcessDiscoveryMessage(const string& identity, const D
Dictionary::Ptr publications; Dictionary::Ptr publications;
if (message.GetPublications(&publications)) { if (message.GetPublications(&publications)) {
BOOST_FOREACH(const Variant& publication, publications | map_values) { Variant publication;
BOOST_FOREACH(tie(tuples::ignore, publication), publications) {
if (trusted || HasMessagePermission(roles, "publications", publication)) { if (trusted || HasMessagePermission(roles, "publications", publication)) {
info->Publications.insert(publication); info->Publications.insert(publication);
if (endpoint) if (endpoint)
@ -387,7 +390,8 @@ void DiscoveryComponent::ProcessDiscoveryMessage(const string& identity, const D
Dictionary::Ptr subscriptions; Dictionary::Ptr subscriptions;
if (message.GetSubscriptions(&subscriptions)) { if (message.GetSubscriptions(&subscriptions)) {
BOOST_FOREACH(const Variant& subscription, subscriptions | map_values) { Variant subscription;
BOOST_FOREACH(tie(tuples::ignore, subscription), subscriptions) {
if (trusted || HasMessagePermission(roles, "subscriptions", subscription)) { if (trusted || HasMessagePermission(roles, "subscriptions", subscription)) {
info->Subscriptions.insert(subscription); info->Subscriptions.insert(subscription);
if (endpoint) if (endpoint)
@ -455,7 +459,8 @@ void DiscoveryComponent::DiscoveryTimerHandler(void)
/* check whether we have to reconnect to one of our upstream endpoints */ /* check whether we have to reconnect to one of our upstream endpoints */
ConfigObject::TMap::Range range = ConfigObject::GetObjects("endpoint"); ConfigObject::TMap::Range range = ConfigObject::GetObjects("endpoint");
BOOST_FOREACH(const ConfigObject::Ptr& object, range | map_values) { ConfigObject::Ptr object;
BOOST_FOREACH(tie(tuples::ignore, object), range) {
/* Check if we're already connected to this endpoint. */ /* Check if we're already connected to this endpoint. */
if (endpointManager->GetEndpointByIdentity(object->GetName())) if (endpointManager->GetEndpointByIdentity(object->GetName()))
continue; continue;

6
icinga/endpointmanager.cpp
View File

@ -240,7 +240,8 @@ void EndpointManager::SendAnycastMessage(Endpoint::Ptr sender,
throw invalid_argument("Message is missing the 'method' property."); throw invalid_argument("Message is missing the 'method' property.");
vector<Endpoint::Ptr> candidates; vector<Endpoint::Ptr> candidates;
BOOST_FOREACH(const Endpoint::Ptr& endpoint, m_Endpoints | map_values) { Endpoint::Ptr endpoint;
BOOST_FOREACH(tie(tuples::ignore, endpoint), m_Endpoints) {
/* don't forward messages between non-local endpoints */ /* don't forward messages between non-local endpoints */
if (!sender->IsLocal() && !endpoint->IsLocal()) if (!sender->IsLocal() && !endpoint->IsLocal())
continue; continue;
@ -274,7 +275,8 @@ void EndpointManager::SendMulticastMessage(Endpoint::Ptr sender,
if (!message.GetMethod(&method)) if (!message.GetMethod(&method))
throw invalid_argument("Message is missing the 'method' property."); throw invalid_argument("Message is missing the 'method' property.");
BOOST_FOREACH(const Endpoint::Ptr& recipient, m_Endpoints | map_values) { Endpoint::Ptr recipient;
BOOST_FOREACH(tie(tuples::ignore, recipient), m_Endpoints) {
/* don't forward messages back to the sender */ /* don't forward messages back to the sender */
if (sender == recipient) if (sender == recipient)
continue; continue;