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

Cli: Don't parse node repository files twice in 'node update-config' 

refs #7917
This commit is contained in:
Michael Friedrich 2014-12-11 14:47:46 +01:00
parent 622bb6f012
commit ebc0845853
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli/nodeupdateconfigcommand.cpp
View File

@ -87,9 +87,10 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
Utility::LoadExtensionLibrary("icinga"); Utility::LoadExtensionLibrary("icinga");
std::vector<String> object_paths = RepositoryUtility::GetObjects(); std::vector<String> object_paths = RepositoryUtility::GetObjects();
std::vector<Dictionary::Ptr> nodes = NodeUtility::GetNodes();
/* first make sure that all nodes are valid and should not be removed */ /* first make sure that all nodes are valid and should not be removed */
BOOST_FOREACH(const Dictionary::Ptr& node, NodeUtility::GetNodes()) { BOOST_FOREACH(const Dictionary::Ptr& node, nodes) {
Dictionary::Ptr repository = node->Get("repository"); Dictionary::Ptr repository = node->Get("repository");
String zone = node->Get("zone"); String zone = node->Get("zone");
String endpoint = node->Get("endpoint"); String endpoint = node->Get("endpoint");
@ -201,7 +202,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
} }
/* next iterate over all nodes and add hosts/services */ /* next iterate over all nodes and add hosts/services */
BOOST_FOREACH(const Dictionary::Ptr& node, NodeUtility::GetNodes()) { BOOST_FOREACH(const Dictionary::Ptr& node, nodes) {
Dictionary::Ptr repository = node->Get("repository"); Dictionary::Ptr repository = node->Get("repository");
String zone = node->Get("zone"); String zone = node->Get("zone");
String endpoint = node->Get("endpoint"); String endpoint = node->Get("endpoint");