Changeset 7354aa1 in nscp for include/client/command_line_parser.cpp

Timestamp:

01/09/12 22:34:25 (17 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

ba63b95

Parents:

a87ce04

Message:

• Fixed hostname issue in NSCAClient (hostname = auto now auto detects hostname
• Fixed some minor issues in NSCA and CLI api
• Added CLI based (exec) APIs to NSCA unit tests (now 697 test for NSCA)

File:

• include/client/command_line_parser.cpp (modified) (3 diffs)

include/client/command_line_parser.cpp

@@ -25 +25 @@
   desc.add_options()
     ("command,c", po::wvalue<std::wstring>(&command_data->command), "The name of the command that the remote daemon should run")
+    ("alias,a", po::wvalue<std::wstring>(&command_data->command), "Same as command")
     ("message,m", po::wvalue<std::wstring>(&command_data->message), "Message")
-    ("result,r", po::value<unsigned int>(&command_data->result), "Result code")
+    ("result,r", po::wvalue<std::wstring>(&command_data->result), "Result code either a number or OK, WARN, CRIT, UNKNOWN")
     ;
 }
@@ -52 +53 @@
 }
 
+int parse_result(std::wstring key) {
+  if (key == _T("UNKNOWN") || key == _T("unknown"))
+    return NSCAPI::returnUNKNOWN;
+  if (key == _T("warn") || key == _T("WARN") || key == _T("WARNING") || key == _T("warning"))
+    return NSCAPI::returnWARN;
+  if (key == _T("crit") || key == _T("CRIT") || key == _T("CRITICAL") || key == _T("critical"))
+    return NSCAPI::returnWARN;
+  if (key == _T("OK") || key == _T("ok"))
+    return NSCAPI::returnUNKNOWN;
+  try {
+    return strEx::stoi(key);
+  } catch (...) {
+    return NSCAPI::returnUNKNOWN;
+  }
+}
 
 int client::command_line_parser::do_execute_command_as_exec(configuration &config, const std::wstring &command, std::list<std::wstring> &arguments, std::string &result) {
@@ -226 +242 @@
   modify_header(config, message.mutable_header(), config.data->recipient);
   message.set_channel("CLI");
-  nscapi::functions::append_simple_submit_request_payload(message.add_payload(), config.data->command, config.data->result, config.data->message);
+  nscapi::functions::append_simple_submit_request_payload(message.add_payload(), config.data->command, parse_result(config.data->result), config.data->message);
 
   return config.handler->submit(config.data, message.mutable_header(), message.SerializeAsString(), result);