Changeset f7f536b in nscp for trunk/include

Timestamp:

02/25/05 21:47:45 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

cab471b

Parents:

107bd0f

Message:

Multiple fixes in various places.

• Added threadding blocks "core"
• Added new Module (CheckDisk)
• Added new option [log] / debug=1 to enable debug logs.
• Added more error messages
• other minor tweaks and fixes

Location:

trunk/include

Files:

• NSCAPI.h (modified) (2 diffs)
• NSCHelper.cpp (modified) (1 diff)
• NSCHelper.h (modified) (2 diffs)
• PDHCounter.h (modified) (1 diff)
• thread.h (modified) (1 diff)

trunk/include/NSCAPI.h

@@ -2 +2 @@
 
 namespace NSCAPI {
+
+  // Various Nagios codes
+  const int returnCRIT = 2;
+  const int returnOK = 0;
+  const int returnWARN = 1;
+  const int returnUNKNOWN = 4;
+  typedef int returnCodes;
 
   // Various Return codes
@@ -16 +23 @@
   const int critical = -10;   // Critical error
   const int warning = 1;      // Warning
-  const int debug = 666;      // Debaug message
+  const int debug = 666;      // Debug message
 
   typedef int messageTypes;   // Message type

trunk/include/NSCHelper.cpp

@@ -56 +56 @@
   return "unknown";
 }
+std::string NSCHelper::translateReturn(NSCAPI::returnCodes returnCode) {
+  if (returnCode == NSCAPI::returnOK)
+    return "OK";
+  else if (returnCode == NSCAPI::returnCRIT)
+    return "CRITICAL";
+  else if (returnCode == NSCAPI::returnWARN)
+    return "WARNING";
+  else
+    return "UNKNOWN";
+}
+
 
 

trunk/include/NSCHelper.h

@@ -10 +10 @@
   std::list<std::string> makelist(const unsigned int argLen, char **argument);
   std::string translateMessageType(NSCAPI::messageTypes msgType);
+  std::string translateReturn(NSCAPI::returnCodes returnCode);
+  inline std::string returnNSCP(NSCAPI::returnCodes returnCode, std::string str) {
+    return translateReturn(returnCode) + "&" + str;
+  }
+
+  /*
+  / * **************************************************************************
+  * max_state(STATE_x, STATE_y)
+  * compares STATE_x to  STATE_y and returns result based on the following
+  * STATE_UNKNOWN < STATE_OK < STATE_WARNING < STATE_CRITICAL
+  *
+  * Note that numerically the above does not hold
+  **************************************************************************** /
+
+  int
+    max_state (int a, int b)
+  {
+    if (a == STATE_CRITICAL || b == STATE_CRITICAL)
+      return STATE_CRITICAL;
+    else if (a == STATE_WARNING || b == STATE_WARNING)
+      return STATE_WARNING;
+    else if (a == STATE_OK || b == STATE_OK)
+      return STATE_OK;
+    else if (a == STATE_UNKNOWN || b == STATE_UNKNOWN)
+      return STATE_UNKNOWN;
+    else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
+      return STATE_DEPENDENT;
+    else
+      return max (a, b);
+  }
+  @bug Use this sceme instead!!
+*/
+
+
+  inline void escalteReturnCode(NSCAPI::returnCodes &currentReturnCode, NSCAPI::returnCodes newReturnCode) {
+    if (newReturnCode == NSCAPI::returnCRIT)
+      currentReturnCode = NSCAPI::returnCRIT;
+    else if ((newReturnCode == NSCAPI::returnWARN) && (currentReturnCode != NSCAPI::returnCRIT) )
+      currentReturnCode = NSCAPI::returnWARN;
+    else if ((newReturnCode == NSCAPI::returnUNKNOWN) 
+      && (currentReturnCode != NSCAPI::returnCRIT) 
+      && (currentReturnCode != NSCAPI::returnWARN) )
+      currentReturnCode = NSCAPI::returnUNKNOWN;
+  }
+  inline void escalteReturnCodeToCRIT(NSCAPI::returnCodes &currentReturnCode) {
+    currentReturnCode = NSCAPI::returnCRIT;
+  }
+  inline void escalteReturnCodeToWARN(NSCAPI::returnCodes &currentReturnCode) {
+    if (currentReturnCode != NSCAPI::returnCRIT)
+      currentReturnCode = NSCAPI::returnWARN;
+  }
+
 };
 
@@ -83 +135 @@
   NSCModuleHelper::Message(NSCAPI::log, __FILE__, __LINE__, msg)
 
-#ifdef _DEBUG
 #define NSC_DEBUG_MSG_STD(msg) NSC_DEBUG_MSG(((std::string)msg).c_str())
 #define NSC_DEBUG_MSG(msg) \
   NSCModuleHelper::Message(NSCAPI::debug, __FILE__, __LINE__, msg)
-#else
-#define NSC_DEBUG_MSG_STD(msg)
-#define NSC_DEBUG_MSG(msg)
-#endif
 
 //////////////////////////////////////////////////////////////////////////

trunk/include/PDHCounter.h

@@ -9 +9 @@
 namespace PDH {
   class PDHException {
-  private:
+  public:
     std::string str_;
     int errCode_;

trunk/include/thread.h

@@ -158 +158 @@
   /**
    * Ask the thread to terminate (within 5 seconds) if not return false.
+   * @param delay The time to wait for the thread
    * @return true if the thread has terminated
    */
-  bool exitThread() {
+  bool exitThread(const unsigned int delay = 5000L) {
     if (!pObject_)
       throw "Could not terminate thread, has not been started yet...";
     pObject_->exitThread();
-    DWORD dwWaitResult = endMutext.wait(5000L);
+    DWORD dwWaitResult = endMutext.wait(delay);
     switch (dwWaitResult) {
       // The thread got mutex ownership.