Changeset cad08fb in nscp for modules/CheckHelpers

Timestamp:

02/18/10 12:22:51 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

b0e7ecf

Parents:

60375ed

Message:

Major update with a new plugin glue that works better with *nix.
Everything should be the same but look tidier

Location:

modules/CheckHelpers

Files:

• CheckHelpers.cpp (modified) (7 diffs)
• CheckHelpers.h (modified) (2 diffs)
• stdafx.h (modified) (1 diff)

modules/CheckHelpers/CheckHelpers.cpp

@@ -35 +35 @@
 bool CheckHelpers::loadModule(NSCAPI::moduleLoadMode mode) {
   try {
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysCRITICAL"), _T("Run another check and regardless of its return code return CRIT."));
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysWARNING"), _T("Run another check and regardless of its return code return WARN."));
-    NSCModuleHelper::registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
-    NSCModuleHelper::registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckVersion"), _T("Just return the nagios version (along with OK status)."));
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    GET_CORE()->registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
+    GET_CORE()->registerCommand(_T("CheckAlwaysCRITICAL"), _T("Run another check and regardless of its return code return CRIT."));
+    GET_CORE()->registerCommand(_T("CheckAlwaysWARNING"), _T("Run another check and regardless of its return code return WARN."));
+    GET_CORE()->registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
+    GET_CORE()->registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckVersion"), _T("Just return the nagios version (along with OK status)."));
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -65 +65 @@
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   if (arguments.empty()) {
-    message = NSCHelper::translateReturn(status) + _T(": Lets pretend everything is going to be ok.");
+    message = nscapi::plugin_helper::translateReturn(status) + _T(": Lets pretend everything is going to be ok.");
     return status;
   }
@@ -76 +76 @@
 NSCAPI::nagiosReturn CheckHelpers::handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf) {
   if (command == _T("CheckVersion")) {
-    message = NSCModuleHelper::getApplicationVersionString();
+    message = GET_CORE()->getApplicationVersionString();
     return NSCAPI::returnOK;
   } else if (command == _T("CheckAlwaysOK")) {
@@ -84 +84 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnOK;
-  } else if (command == _T("CheckVersion")) {
-    message = NSCModuleHelper::getApplicationVersionString();
-    return NSCAPI::returnOK;
-  } else if (command == _T("CheckOK")) {
-    return checkSimpleStatus(NSCAPI::returnOK, arguments, message, perf);
-  } else if (command == _T("CheckWARNING")) {
-    return checkSimpleStatus(NSCAPI::returnWARN, arguments, message, perf);
-  } else if (command == _T("CheckCRITICAL")) {
-    return checkSimpleStatus(NSCAPI::returnCRIT, arguments, message, perf);
   } else if (command == _T("CheckAlwaysCRITICAL")) {
     if (arguments.size() < 1) {
@@ -101 +92 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnCRIT;
   } else if (command == _T("CheckAlwaysWARNING")) {
@@ -109 +100 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnWARN;
   } else if (command == _T("CheckOK")) {
@@ -153 +144 @@
     std::list<std::wstring> sub_args;
     std::wstring tMsg, tPerf;
-    NSCAPI::nagiosReturn tRet = NSCModuleHelper::InjectSimpleCommand((*cit2).first.c_str(), (*cit2).second, tMsg, tPerf);
-    returnCode = NSCHelper::maxState(returnCode, tRet);
+    NSCAPI::nagiosReturn tRet = GET_CORE()->InjectSimpleCommand((*cit2).first.c_str(), (*cit2).second, tMsg, tPerf);
+    returnCode = nscapi::plugin_helper::maxState(returnCode, tRet);
     if (!message.empty())
       message += _T(", ");

modules/CheckHelpers/CheckHelpers.h

@@ -23 +23 @@
 #include <strEx.h>
 
-class CheckHelpers : public NSCModuleHelper::SimpleCommand {
+class CheckHelpers : public nscapi::impl::SimpleCommand {
 private:
 
@@ -37 +37 @@
     return _T("Helper function");
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 3, 0 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }

modules/CheckHelpers/stdafx.h

@@ -28 +28 @@
 
 #include <NSCAPI.h>
-#include <nsc_module_wrapper.hpp>
-#include <NSCHelper.h>
+#include <nscapi/plugin.hpp>