Changeset 497b779 in nscp for modules/CheckHelpers

Timestamp:

08/19/10 13:36:13 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

de7ec29

Parents:

184d575

Message:

New settings client (c++ instead of c) which looks pretty sweet :P
Only NRPEServer and CHeckExternalScripts implements it as of yet...

Location:

modules/CheckHelpers

Files:

• CheckHelpers.cpp (modified) (2 diffs)
• CheckHelpers.h (modified) (2 diffs)
• module.cmake (added)

modules/CheckHelpers/CheckHelpers.cpp

@@ -32 +32 @@
 }
 
+bool CheckHelpers::loadModule() {
+  return false;
+}
 
-bool CheckHelpers::loadModule(NSCAPI::moduleLoadMode mode) {
+bool CheckHelpers::loadModuleEx(std::wstring alias, NSCAPI::moduleLoadMode mode) {
   try {
     GET_CORE()->registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
@@ -74 +77 @@
 }
 
-NSCAPI::nagiosReturn CheckHelpers::handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf) {
+NSCAPI::nagiosReturn CheckHelpers::handleCommand(const strEx::wci_string command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf) {
   if (command == _T("checkversion")) {
     message = GET_CORE()->getApplicationVersionString();

modules/CheckHelpers/CheckHelpers.h

@@ -30 +30 @@
   virtual ~CheckHelpers();
   // Module calls
-  bool loadModule(NSCAPI::moduleLoadMode mode);
+  bool loadModule();
+  bool loadModuleEx(std::wstring alias, NSCAPI::moduleLoadMode mode);
   bool unloadModule();
 
@@ -47 +48 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  NSCAPI::nagiosReturn handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
+  NSCAPI::nagiosReturn handleCommand(const strEx::wci_string command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf);
 
   // Check commands