Changeset bb8b6d1 in nscp

Timestamp:

09/19/08 06:48:41 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

c09c225

Parents:

371df23

Message:

2008-09-18 MickeM - 0.3.4

• Changed so "missing services" are treated as stopped.

CheckServiceState missing=stopped ShowAll

OK: missing: not found

• Fixed issue with : in service name. + Added some "reasonable default cheks" under [External Alias] for the CheckExternalScripts.dll module.

Files:

• NSC.dist (modified) (1 diff)
• changelog (modified) (1 diff)
• include/EnumNtSrv.cpp (modified) (1 diff)
• include/EnumNtSrv.h (modified) (1 diff)
• include/checkHelpers.hpp (modified) (3 diffs)
• include/config.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (5 diffs)

NSC.dist

@@ -192 +192 @@
 ;alias_service=checkServiceState CheckAll
 ;alias_mem=checkMem MaxWarn=80% MaxCrit=90% ShowAll type=physical
+;alias_event_log=CheckEventLog file=application file=system filter=new filter=out MaxWarn=1 MaxCrit=1 filter-generated=>2d filter-severity==success filter-severity==informational truncate=1023 unique descriptions  "syntax=%severity%: %source%: %message% (%count%)"
+
 
 

changelog

@@ -4 +4 @@
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
  * Improved socket performance (would be nice if we could be used as a "hub")
+
+2008-09-18 MickeM - 0.3.4
+ * Changed so "missing services" are treated as stopped.
+    CheckServiceState missing=stopped ShowAll
+  OK: missing: not found
+ * Fixed issue with : in service name.
+ + Added some "reasonable default cheks" under [External Alias] for the CheckExternalScripts.dll module. 
 
 2008-09-17 MickeM - 0.3.4 RC-6

include/EnumNtSrv.cpp

@@ -189 +189 @@
   SC_HANDLE sh = ::OpenService(scman,name.c_str(),SERVICE_QUERY_STATUS);
   if (!sh) {
+    std::wstring short_name;
     DWORD bufLen = SC_BUF_LEN;
     TCHAR *buf = new TCHAR[bufLen+1];
     if (GetServiceKeyName(scman, name.c_str(), buf, &bufLen) == 0) {
+      short_name = name;
+    } else {
+      short_name = buf;
+    }
+    delete [] buf;
+    sh = ::OpenService(scman,short_name.c_str(),SERVICE_QUERY_STATUS);
+    if (sh == NULL) {
+      DWORD dwErr = GetLastError();
       ::CloseServiceHandle(scman);
-      delete [] buf;
-      throw NTServiceException(name, _T("GetServiceKeyName: Could not translate service name: ") + error::lookup::last_error());
-    }
-    /*
-    Why does this not work? (a bug in the API? says it should return the correct size?)
-    if (bufLen >= SC_BUF_LEN) {
-      ::CloseServiceHandle(scman);
-      throw NTServiceException(name, "Service name to long to handle", GetLastError());
-    }
-    buf[bufLen] = 0;
-    */
-    sh = ::OpenService(scman,buf,SERVICE_QUERY_STATUS);
-    delete [] buf;
-    if (sh == NULL) {
-      ::CloseServiceHandle(scman);
-      throw NTServiceException(name, _T("OpenService: Could not open Service: ") + error::lookup::last_error());
+      if (dwErr == ERROR_SERVICE_DOES_NOT_EXIST) {
+        info.m_dwCurrentState = MY_SERVICE_NOT_FOUND;
+        info.m_dwServiceType = MY_SERVICE_NOT_FOUND;
+        return info;
+      } else {
+        throw NTServiceException(name, _T("OpenService: Could not open Service: ") + error::lookup::last_error(dwErr));
+      }
     }
   }

include/EnumNtSrv.h

@@ -47 +47 @@
   }
 };
+#define MY_SERVICE_NOT_FOUND                        0xffff0000
 
 class TNtServiceInfo {

include/checkHelpers.hpp

@@ -298 +298 @@
 
   typedef unsigned long state_type;
-  const int state_none  = 0x00;
-  const int state_started = 0x01;
-  const int state_stopped = 0x02;
+  const int state_none    = 0x00;
+  const int state_started   = 0x01;
+  const int state_stopped   = 0x02;
+  const int state_not_found = 0x06;
 
   class state_handler {
@@ -314 +315 @@
         else if (*it == _T("ignored"))
           ret |= state_none;
+        else if (*it == _T("not found"))
+          ret |= state_not_found;
       }
       return ret;
@@ -324 +327 @@
       else if (value == state_none)
         return _T("none");
+      else if (value == state_not_found)
+        return _T("not found");
       return _T("unknown");
     }

include/config.h

@@ -26 +26 @@
 
 // Version
-//#define SZBETATAG _T(" ")
-#define SZBETATAG _T(" RC ")  
+#define SZBETATAG _T(" ")
+//#define SZBETATAG _T(" RC ")  
 //#define SZBETATAG _T(" BETA ") 
 #define SZVERSION STRPRODUCTVER SZBETATAG STRPRODUCTDATE

modules/CheckSystem/CheckSystem.cpp

@@ -483 +483 @@
   else if (state == SERVICE_STOPPED)
     return checkHolders::state_stopped;
+  else if (state == MY_SERVICE_NOT_FOUND)
+    return checkHolders::state_not_found;
   return checkHolders::state_none;
 }
@@ -534 +536 @@
     MAP_OPTIONS_BOOL_TRUE(_T("CheckAll"), bAutoStart)
     MAP_OPTIONS_INSERT(_T("exclude"), excludeList)
-    MAP_OPTIONS_SECONDARY_BEGIN(_T(":"), p2)
-    MAP_OPTIONS_MISSING_EX(p2, msg, _T("Unknown argument: "))
-    MAP_OPTIONS_SECONDARY_END()
+    //MAP_OPTIONS_SECONDARY_BEGIN(_T(":"), p2)
+    //MAP_OPTIONS_MISSING_EX(p2, msg, _T("Unknown argument: "))
+    //MAP_OPTIONS_SECONDARY_END()
     else { 
       tmpObject.data = p__.first;
@@ -594 +596 @@
             if (!msg.empty()) msg += _T(" - ");
             msg += (*it).data + _T(": Stopped");
+          } else if (info.m_dwCurrentState == MY_SERVICE_NOT_FOUND) {
+            if (!msg.empty()) msg += _T(" - ");
+            msg += (*it).data + _T(": Not found");
           } else {
             if (!msg.empty()) msg += _T(" - ");
@@ -615 +620 @@
       else if (info.m_dwCurrentState == SERVICE_STOPPED)
         value = checkHolders::state_stopped;
+      else if (info.m_dwCurrentState == MY_SERVICE_NOT_FOUND)
+        value = checkHolders::state_not_found;
       else
         value = checkHolders::state_none;
       (*it).perfData = bPerfData;
+      (*it).setDefault(tmpObject);
       (*it).runCheck(value, returnCode, msg, perf);
     }
@@ -623 +631 @@
   }
   if (msg.empty())
-    msg = _T("OK: All services are running.");
+    msg = _T("OK: All services are in their apropriate state.");
   else if (!bNSClient)
     msg = NSCHelper::translateReturn(returnCode) + _T(": ") + msg;