tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 06:34:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in node update-config

Browse Source 
fixes #8182
This commit is contained in:
Michael Friedrich 2015-01-09 14:10:48 +01:00
parent 844defd362
commit 123f7fd552
1 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
lib/cli/nodeupdateconfigcommand.cpp
View File

@ -115,13 +115,15 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
Dictionary::Ptr old_node = old_node_objs.second; Dictionary::Ptr old_node = old_node_objs.second;
Dictionary::Ptr old_node_repository = old_node->Get("repository"); Dictionary::Ptr old_node_repository = old_node->Get("repository");
ObjectLock olock(old_node_repository); if (old_node_repository) {
BOOST_FOREACH(const Dictionary::Pair& kv, old_node_repository) { ObjectLock olock(old_node_repository);
String host = kv.first; BOOST_FOREACH(const Dictionary::Pair& kv, old_node_repository) {
String host = kv.first;
Dictionary::Ptr host_attrs = new Dictionary(); Dictionary::Ptr host_attrs = new Dictionary();
host_attrs->Set("name", host); host_attrs->Set("name", host);
RepositoryUtility::RemoveObject(host, "Host", host_attrs); //this removes all services for this host as well RepositoryUtility::RemoveObject(host, "Host", host_attrs); //this removes all services for this host as well
}
} }
String zone = old_node->Get("zone"); String zone = old_node->Get("zone");
@ -142,56 +144,58 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
Dictionary::Ptr old_node = old_node_objs.second; Dictionary::Ptr old_node = old_node_objs.second;
Dictionary::Ptr old_node_repository = old_node->Get("repository"); Dictionary::Ptr old_node_repository = old_node->Get("repository");
ObjectLock xlock(old_node_repository); if (old_node_repository) {
BOOST_FOREACH(const Dictionary::Pair& kv, old_node_repository) { ObjectLock xlock(old_node_repository);
String old_host = kv.first; BOOST_FOREACH(const Dictionary::Pair& kv, old_node_repository) {
String old_host = kv.first;
if (old_host == "localhost") { if (old_host == "localhost") {
Log(LogWarning, "cli") Log(LogWarning, "cli")
<< "Ignoring host '" << old_host << "'. Please make sure to configure a unique name on your node '" << old_node_name << "'."; << "Ignoring host '" << old_host << "'. Please make sure to configure a unique name on your node '" << old_node_name << "'.";
continue; continue;
} }
/* check against black/whitelist before trying to remove host */ /* check against black/whitelist before trying to remove host */
if (NodeUtility::CheckAgainstBlackAndWhiteList("blacklist", old_node_name, old_host, Empty) && if (NodeUtility::CheckAgainstBlackAndWhiteList("blacklist", old_node_name, old_host, Empty) &&
!NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", old_node_name, old_host, Empty)) { !NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", old_node_name, old_host, Empty)) {
Log(LogWarning, "cli") Log(LogWarning, "cli")
<< "Host '" << old_node << "' on node '" << old_node << "' is blacklisted, but not whitelisted. Skipping."; << "Host '" << old_node << "' on node '" << old_node << "' is blacklisted, but not whitelisted. Skipping.";
continue; continue;
} }
if (!new_node_repository->Contains(old_host)) { if (!new_node_repository->Contains(old_host)) {
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Node update found old host '" << old_host << "' on node '" << old_node_name << "'. Removing it."; << "Node update found old host '" << old_host << "' on node '" << old_node_name << "'. Removing it.";
Dictionary::Ptr host_attrs = new Dictionary(); Dictionary::Ptr host_attrs = new Dictionary();
host_attrs->Set("name", old_host); host_attrs->Set("name", old_host);
RepositoryUtility::RemoveObject(old_host, "Host", host_attrs); //this will remove all services for this host too RepositoryUtility::RemoveObject(old_host, "Host", host_attrs); //this will remove all services for this host too
} else { } else {
/* host exists, now check all services for this host */ /* host exists, now check all services for this host */
Array::Ptr old_services = kv.second; Array::Ptr old_services = kv.second;
Array::Ptr new_services = new_node_repository->Get(old_host); Array::Ptr new_services = new_node_repository->Get(old_host);
ObjectLock ylock(old_services); ObjectLock ylock(old_services);
BOOST_FOREACH(const String& old_service, old_services) { BOOST_FOREACH(const String& old_service, old_services) {
/* check against black/whitelist before trying to remove service */ /* check against black/whitelist before trying to remove service */
if (NodeUtility::CheckAgainstBlackAndWhiteList("blacklist", old_node_name, old_host, old_service) && if (NodeUtility::CheckAgainstBlackAndWhiteList("blacklist", old_node_name, old_host, old_service) &&
!NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", old_node_name, old_host, old_service)) { !NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", old_node_name, old_host, old_service)) {
Log(LogWarning, "cli") Log(LogWarning, "cli")
<< "Service '" << old_service << "' on host '" << old_host << "' on node '" << "Service '" << old_service << "' on host '" << old_host << "' on node '"
<< old_node_name << "' is blacklisted, but not whitelisted. Skipping."; << old_node_name << "' is blacklisted, but not whitelisted. Skipping.";
continue; continue;
} }
if (!new_services->Contains(old_service)) { if (!new_services->Contains(old_service)) {
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Node update found old service '" << old_service << "' on host '" << old_host << "Node update found old service '" << old_service << "' on host '" << old_host
<< "' on node '" << old_node_name << "'. Removing it."; << "' on node '" << old_node_name << "'. Removing it.";
Dictionary::Ptr service_attrs = new Dictionary(); Dictionary::Ptr service_attrs = new Dictionary();
service_attrs->Set("name", old_service); service_attrs->Set("name", old_service);
service_attrs->Set("host_name", old_host); service_attrs->Set("host_name", old_host);
RepositoryUtility::RemoveObject(old_service, "Service", service_attrs); RepositoryUtility::RemoveObject(old_service, "Service", service_attrs);
}
} }
} }
} }