Changeset 2c95d22 in nscp for modules/NRPEClient/NRPEClient.cpp

Timestamp:

08/15/11 00:02:39 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

b9498ef

Parents:

65a2940

Message:

2011-08-14 MickeM

• Rename Function to Registry in PythonScript API as well as some other function renames
• Started to clean up the helpers around the API
• Added support for execute to PythonScripts? to execute commands
• BUG: just realised that static plugin instances prevent multiple instances :) Will fix but not now as it is not important (for me)...
• Added initial support for channels to PythonScript Core still lacks support for subscribing to arbitrary channel

File:

• modules/NRPEClient/NRPEClient.cpp (modified) (2 diffs)

modules/NRPEClient/NRPEClient.cpp

@@ -238 +238 @@
 }
 
-int NRPEClient::commandLineExec(const std::wstring &command, std::vector<std::wstring> &arguments, std::wstring &result) {
-  NSC_DEBUG_MSG_STD(_T("===> ") + command);
+int NRPEClient::commandLineExec(const std::wstring &command, std::list<std::wstring> &arguments, std::wstring &result) {
   if (command != _T("query") && command != _T("help"))
-    return NSCAPI::returnUNKNOWN;
+    return NSCAPI::returnIgnored;
   try {
     NRPEClient::nrpe_connection_data command_data;
@@ -250 +249 @@
     add_options(desc, command_data);
 
+    std::vector<std::wstring> vargs(arguments.begin(), arguments.end());
     po::positional_options_description p;
     p.add("arguments", -1);
-    po::wparsed_options parsed = po::basic_command_line_parser<wchar_t>(arguments).options(desc).positional(p).run();
+    po::wparsed_options parsed = po::basic_command_line_parser<wchar_t>(vargs).options(desc).positional(p).run();
     po::store(parsed, vm);
     po::notify(vm);