Changeset 7b51081 in nscp for trunk/modules/CheckDisk/CheckDisk.cpp

Timestamp:

02/23/07 19:25:23 (6 years ago)

Author:

Michael Medin <michael@…>

Children:

3c35ad4

Parents:

858709e

Message:

Getting ready for the 0.2.7 release, a few minor fixes here and there...

File:

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

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -103 +103 @@
   bool bCheckAllOthers = false;
   bool bNSClient = false;
+  bool bPerfData = true;
   std::list<DriveConatiner> drives;
 
@@ -113 +114 @@
     MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterRemovable, "REMOVABLE")
     MAP_OPTIONS_BOOL_VALUE("FilterType", bFilterRemote, "REMOTE")
+    MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
     MAP_OPTIONS_BOOL_TRUE(CHECK_ALL, bCheckAll)
@@ -183 +185 @@
     if (drive.data.length() == 1)
       drive.data += ":";
+    if (!bPerfData)
+      drive.perfData = false;
     UINT drvType = GetDriveType(drive.data.c_str());
 
@@ -231 +235 @@
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   std::list<std::string> args = arrayBuffer::arrayBuffer2list(argLen, char_args);
+  bool bPerfData = true;
   if (args.empty()) {
     message = "Missing argument(s).";
@@ -245 +250 @@
     MAP_OPTIONS_STR("MaxCrit", tmpObject.crit.max)
     MAP_OPTIONS_STR("MinCrit", tmpObject.crit.min)
+    MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
     else if (p2.first == "File") {
@@ -263 +269 @@
     recursive_scan<get_size>(path.data, sizeFinder);
     path.setDefault(tmpObject);
+    if (!bPerfData)
+      path.perfData = false;
 
     checkHolders::disk_size_type size = sizeFinder.getSize();
@@ -456 +464 @@
   CheckFileConatiner query;
   std::string syntax = "%filename%";
+  bool bPerfData = true;
 
   try {
@@ -461 +470 @@
       MAP_OPTIONS_NUMERIC_ALL(query, "")
       MAP_OPTIONS_STR2INT("truncate", truncate)
+      MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
       MAP_OPTIONS_STR("syntax", syntax)
       MAP_OPTIONS_PUSH("path", paths)