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

Allow using --name to match against internal names (__name) 

refs #7251
This commit is contained in:
Gunnar Beutner 2014-10-15 18:31:05 +02:00
parent 575a9eb849
commit f92282ae0e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cli/objectlistcommand.cpp
View File

@ -89,7 +89,7 @@ int ObjectListCommand::Run(const boost::program_options::variables_map& vm, cons
std::map<String, int> type_count; std::map<String, int> type_count;
String message; String message;
String name_filter, type_filter = ""; String name_filter, type_filter;
if (vm.count("name")) if (vm.count("name"))
name_filter = vm["name"].as<std::string>(); name_filter = vm["name"].as<std::string>();
@ -116,16 +116,18 @@ void ObjectListCommand::ReadObject(const String& message, std::map<String, int>&
{ {
Dictionary::Ptr object = JsonDeserialize(message); Dictionary::Ptr object = JsonDeserialize(message);
Dictionary::Ptr properties = object->Get("properties");
String internal_name = properties->Get("__name");
String name = object->Get("name"); String name = object->Get("name");
String type = object->Get("type"); String type = object->Get("type");
if(!name_filter.IsEmpty() && !Utility::Match(name_filter, name)) if (!name_filter.IsEmpty() && !Utility::Match(name_filter, name) && !Utility::Match(name_filter, internal_name))
return; return;
if(!type_filter.IsEmpty() && !Utility::Match(type_filter, type)) if (!type_filter.IsEmpty() && !Utility::Match(type_filter, type))
return; return;
bool abstract = object->Get("abstract"); bool abstract = object->Get("abstract");
Dictionary::Ptr properties = object->Get("properties");
Dictionary::Ptr debug_hints = object->Get("debug_hints"); Dictionary::Ptr debug_hints = object->Get("debug_hints");
std::ostringstream msgbuf; std::ostringstream msgbuf;
@ -135,7 +137,7 @@ void ObjectListCommand::ReadObject(const String& message, std::map<String, int>&
else else
msgbuf << "Object '"; msgbuf << "Object '";
msgbuf << "\x1b[1;34m" << properties->Get("__name") << "\x1b[0m" << "'"; //blue msgbuf << "\x1b[1;34m" << internal_name << "\x1b[0m" << "'"; //blue
msgbuf << " of type '" << "\x1b[1;34m" << type << "\x1b[0m" << "':\n"; //blue msgbuf << " of type '" << "\x1b[1;34m" << type << "\x1b[0m" << "':\n"; //blue
msgbuf << FormatProperties(properties, debug_hints, 2); msgbuf << FormatProperties(properties, debug_hints, 2);