Changeset 580392ac in nscp for trunk/modules/CheckDisk/CheckDisk.cpp

Timestamp:

11/18/06 14:14:22 (7 years ago)

Author:

Michael Medin <michael@…>

Children:

858709e

Parents:

edbbfbb

Message:

+ Added support for empty NRPE checking (i.e.. chec_nrpe without a -c argument)

• Added error message when detected language is missing from counters.defs + Added Swedish locale to counters.defs (yes, I switched to Swedish XP on my computer :)
• Fixed : (and possibly other problems) in counters when checking from check_nt (via NSCLient protocol) + Added CheckAllExcept? to CheckDrive? to check all except the specified drives.

File:

• trunk/modules/CheckDisk/CheckDisk.cpp (modified) (3 diffs)

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -100 +100 @@
   bool bFilterCDROM = false;
   bool bCheckAll = false;
+  bool bCheckAllOthers = false;
   bool bNSClient = false;
   std::list<DriveConatiner> drives;
@@ -113 +114 @@
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
+    MAP_OPTIONS_BOOL_TRUE(CHECK_ALL_OTHERS, bCheckAllOthers)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
       else if (p2.first == "Drive") {
@@ -143 +145 @@
       dwDrives >>= 1;
     }
+  }
+  if (bCheckAllOthers) {
+    std::list<DriveConatiner> checkdrives;
+    DWORD dwDrives = GetLogicalDrives();
+    int idx = 0;
+    while (dwDrives != 0) {
+      if (dwDrives & 0x1) {
+        std::string drv;
+        drv += static_cast<char>('A' + idx); drv += ":\\";
+        UINT drvType = GetDriveType(drv.c_str());
+        if ( ((!bFilter)&&(drvType == DRIVE_FIXED))  ||
+          ((bFilter)&&(bFilterFixed)&&(drvType==DRIVE_FIXED)) ||
+          ((bFilter)&&(bFilterCDROM)&&(drvType==DRIVE_CDROM)) ||
+          ((bFilter)&&(bFilterRemote)&&(drvType==DRIVE_REMOTE)) ||
+          ((bFilter)&&(bFilterRemovable)&&(drvType==DRIVE_REMOVABLE)) )  
+        {
+          bool bFound = false;
+          for (std::list<DriveConatiner>::const_iterator pit = drives.begin();pit!=drives.end();++pit) {
+            DriveConatiner drive = (*pit);
+            if (drive.data == drv)
+              bFound = true;
+          }
+          if (!bFound)
+            checkdrives.push_back(DriveConatiner(drv, tmpObject.warn, tmpObject.crit));
+        }
+      }
+      idx++;
+      dwDrives >>= 1;
+    }
+    drives = checkdrives;
   }