Changeset 2180143 in nscp for trunk/modules/CheckSystem

Timestamp:

06/23/07 11:20:50 (6 years ago)

Author:

Michael Medin <michael@…>

Children:

e6722ca

Parents:

856d6cf

Message:

• Fixed the "check memory" issues for real this time.
  • Fixed problem with : in counter names #50 (anything starts with \ is considerd a counter so if you use aliases with \ this will break things for you.

File:

• trunk/modules/CheckSystem/CheckSystem.cpp (modified) (6 diffs)

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -601 +601 @@
 
   MAP_OPTIONS_BEGIN(stl_args)
+    MAP_OPTIONS_SHOWALL(tmpObject)
     MAP_OPTIONS_STR_AND("type", tmpObject.data, list.push_back(tmpObject))
     MAP_OPTIONS_STR_AND("Type", tmpObject.data, list.push_back(tmpObject))
@@ -609 +610 @@
     MAP_OPTIONS_BOOL_FALSE(IGNORE_PERFDATA, bPerfData)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
-
-    MAP_OPTIONS_USELESS_IF_LAST(stl_args)
     MAP_OPTIONS_DISK_ALL(tmpObject, "", "Free", "Used")
     MAP_OPTIONS_STR("Alias", tmpObject.data)
@@ -617 +616 @@
   MAP_OPTIONS_END()
 
-  
   if (bNSClient) {
     tmpObject.data = "paged";
@@ -629 +627 @@
   for (std::list<MemoryConatiner>::const_iterator pit = list.begin(); pit != list.end(); ++pit) {
     MemoryConatiner check = (*pit);
+    check.setDefault(tmpObject);
     checkHolders::PercentageValueType<unsigned long long, unsigned long long> value;
     if (firstPaged && (check.data == "paged")) {
@@ -862 +861 @@
     MAP_OPTIONS_BOOL_EX("Averages", bCheckAverages, "true", "false")
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
+    MAP_OPTIONS_FIRST_CHAR('\\', tmpObject.data, counters.push_back(tmpObject))
     MAP_OPTIONS_SECONDARY_BEGIN(":", p2)
       else if (p2.first == "Counter") {
@@ -872 +872 @@
     MAP_OPTIONS_FALLBACK_AND(tmpObject.data, counters.push_back(tmpObject))
   MAP_OPTIONS_END()
-
   for (std::list<CounterConatiner>::const_iterator cit = counters.begin(); cit != counters.end(); ++cit) {
     CounterConatiner counter = (*cit);