Changeset c09c225 in nscp for modules/CheckSystem

Timestamp:

09/25/08 19:58:20 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

7531979

Parents:

bb8b6d1

Message:

2008-09-24 MickeM - 0.3.5

• Fixed issue with CheckServiceState and CheckAll? (it now works) + Added new check: CheckFile2 which has the same syntax as the event log filtering.

Usage: CheckFile2 file=c:\test\*.txt filter=in filter+creation=<24h "syntax=%filename% was created %creation%" MinWarn=0 MinCrit=0

File:

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

modules/CheckSystem/CheckSystem.cpp

@@ -575 +575 @@
       }
     } 
+    tmpObject.crit.state = _T("ignored");
   }
   for (std::list<StateContainer>::iterator it = list.begin(); it != list.end(); ++it) {
@@ -622 +623 @@
       else if (info.m_dwCurrentState == MY_SERVICE_NOT_FOUND)
         value = checkHolders::state_not_found;
-      else
+      else {
+        NSC_LOG_MESSAGE(_T("Service had no (valid) state: ") + (*it).data + _T(" (") + strEx::itos(info.m_dwCurrentState) + _T(")"));
         value = checkHolders::state_none;
+      }
+      unsigned int x = returnCode;
       (*it).perfData = bPerfData;
       (*it).setDefault(tmpObject);
       (*it).runCheck(value, returnCode, msg, perf);
-    }
-
-  }
-  if (msg.empty())
+//      NSC_LOG_MESSAGE(_T("Service: ") + (*it).data + _T(" (") + strEx::itos(info.m_dwCurrentState) + _T(":") + strEx::itos((*it).warn.state.value_) + _T(":") + strEx::itos((*it).crit.state.value_) + _T(") -- (") + strEx::itos(returnCode) + _T(":") + strEx::itos(x) + _T(")"));
+    }
+  }
+  if (msg.empty() && returnCode == NSCAPI::returnOK)
     msg = _T("OK: All services are in their apropriate state.");
+  else if (msg.empty())
+    msg = NSCHelper::translateReturn(returnCode) + _T(": Whooha this is odd.");
   else if (!bNSClient)
     msg = NSCHelper::translateReturn(returnCode) + _T(": ") + msg;