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

CLI: Add --count to 'object list' and hide counts by default 

refs #7251
This commit is contained in:
Michael Friedrich 2014-10-15 16:43:10 +02:00
parent c1b92756b5
commit 7a56f3c1c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cli/objectlistcommand.cpp
View File

@ -57,6 +57,7 @@ void ObjectListCommand::InitParameters(boost::program_options::options_descripti
ArgumentCompletionDescription& argCompletionDesc) const
{
visibleDesc.add_options()
("count,c", "display object counts by types")
("name,n", po::value<std::string>(), "filter by name matches")
("type,t", po::value<std::string>(), "filter by type matches");
}
@ -103,9 +104,10 @@ int ObjectListCommand::Run(const boost::program_options::variables_map& vm, cons
sfp->Close();
fp.close();
std::cout << FormatTypeCounts(type_count) << std::endl;
if (vm.count("count"))
std::cout << FormatTypeCounts(type_count) << std::endl;
Log(LogInformation, "cli", "Parsed " + Convert::ToString(objects_count) + " objects.");
Log(LogNotice, "cli", "Parsed " + Convert::ToString(objects_count) + " objects.");
return 0;
}
@ -133,7 +135,7 @@ void ObjectListCommand::ReadObject(const String& message, std::map<String, int>&
else
msgbuf << "Object '";
msgbuf << "\x1b[1;37m" << properties->Get("__name") << "\x1b[0m" << "'"; //light gray
msgbuf << "\x1b[1;34m" << properties->Get("__name") << "\x1b[0m" << "'"; //blue
msgbuf << " of type '" << "\x1b[1;34m" << type << "\x1b[0m" << "':\n"; //blue
msgbuf << FormatProperties(properties, debug_hints, 2);