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

Merge pull request #6160 from Icinga/fix/code-style-global-zones 

Replace std::vector:push_back calls with initializer list
This commit is contained in:
Gunnar Beutner 2018-03-13 09:22:10 +01:00 committed by GitHub
parent 3043a190ca 592d1c7d7e
commit 6a444a0fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cli/nodesetupcommand.cpp
View File

@ -158,15 +158,12 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
/* write zones.conf and update with zone + endpoint information */
Log(LogInformation, "cli", "Generating zone and object configuration.");
std::vector<String> globalZones;
std::vector<String> globalZones { "global-templates", "director-global" };
std::vector<std::string> setupGlobalZones;
if (vm.count("global_zones"))
setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
globalZones.push_back("global-templates");
globalZones.push_back("director-global");
for (int i = 0; i < setupGlobalZones.size(); i++) {
if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) {
Log(LogCritical, "cli")
@ -429,15 +426,12 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
Log(LogInformation, "cli", "Generating zone and object configuration.");
std::vector<String> globalZones;
std::vector<String> globalZones { "global-templates", "director-global" };
std::vector<std::string> setupGlobalZones;
if (vm.count("global_zones"))
setupGlobalZones = vm["global_zones"].as<std::vector<std::string> >();
globalZones.push_back("global-templates");
globalZones.push_back("director-global");
for (int i = 0; i < setupGlobalZones.size(); i++) {
if (std::find(globalZones.begin(), globalZones.end(), setupGlobalZones[i]) != globalZones.end()) {
Log(LogCritical, "cli")

10
lib/cli/nodewizardcommand.cpp
View File

@ -499,10 +499,7 @@ wizard_ticket:
/* apilistener config */
Log(LogInformation, "cli", "Generating local zones.conf.");
std::vector<String> globalZones;
globalZones.push_back("global-templates");
globalZones.push_back("director-global");
std::vector<String> globalZones { "global-templates", "director-global" };
std::cout << "\nDo you want to specify additional global zones? [y/N]: ";
@ -633,10 +630,7 @@ int NodeWizardCommand::MasterSetup() const
else
std::cout << "'api' feature already enabled.\n";
std::vector<String> globalZones;
globalZones.push_back("global-templates");
globalZones.push_back("director-global");
std::vector<String> globalZones { "global-templates", "director-global" };
std::cout << "\nDo you want to specify additional global zones? [y/N]: ";