Changeset df0ab60 in nscp for NSClient++.cpp

Timestamp:

11/21/07 21:53:18 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

58a724d

Parents:

5044c09

Message:

2007-11-21 MickeM

• Fixed process counter so checkProcState now return the *correct* number (previously it was correct-1)
• Fixed som missing exceptions that were not caught + Added "AliasCol?" option to CheckWMIValue to allow a column to be used as "alias" for a result set:

CheckWMIValue -a "Query=select Caption, ThreadCount? from Win32_Process" MaxWarn=50 MaxCrit=100 Check:threads=ThreadCount AliasCol?=Caption

will give you: "System threads: 98 > warning, svchost.exe threads: 87 > warning"

File:

• NSClient++.cpp (modified) (7 diffs)

NSClient++.cpp

@@ -106 +106 @@
     } else if ( _stricmp( "noboot", argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
+      mainClient.enableDebug(true);
       int nRetCode = -1;
       if (argc>=4)
@@ -181 +182 @@
   try {
     Settings::getInstance()->setFile(getBasePath(), "NSC.ini");
+    if (debug_) {
+      Settings::getInstance()->setInt("log", "debug", 1);
+    }
   } catch (SettingsException e) {
     LOG_ERROR_STD("Could not find settings: " + e.getMessage());
@@ -187 +191 @@
     LOG_ERROR_STD("Unknown exception reading settings...");
     return false;
-  }
-  if (debug_) {
-    Settings::getInstance()->setInt("log", "debug", 1);
   }
 
@@ -201 +202 @@
     return false;
   }
-
-  SettingsT::sectionList list = Settings::getInstance()->getSection("modules");
-  for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
-    try {
-      loadPlugin(getBasePath() + "modules\\" + (*it));
-    } catch(const NSPluginException& e) {
-      LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
-      return false;
-    } catch (...) {
-      LOG_ERROR_STD("Unknown exception loading plugin: " + (*it));
-      return false;
-    }
+  try {
+    SettingsT::sectionList list = Settings::getInstance()->getSection("modules");
+    for (SettingsT::sectionList::iterator it = list.begin(); it != list.end(); it++) {
+      try {
+        loadPlugin(getBasePath() + "modules\\" + (*it));
+      } catch(const NSPluginException& e) {
+        LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
+        return false;
+      } catch (...) {
+        LOG_ERROR_STD("Unknown exception loading plugin: " + (*it));
+        return false;
+      }
+    }
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
   }
   try {
@@ -472 +476 @@
   static status d = unknown;
   if (d == unknown) {
-    if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
+    try {
+      if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
+        d = debug;
+      else
+        d = nodebug;
+    } catch (SettingsException e) {
       d = debug;
-    else
-      d = nodebug;
+    }
   }
   return (d == debug);
@@ -554 +562 @@
   basePath = path.substr(0, pos) + "\\";
   delete [] buffer;
-  Settings::getInstance()->setFile(basePath, "NSC.ini");
+  try {
+    Settings::getInstance()->setFile(basePath, "NSC.ini");
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
+  }
   return basePath;
 }
@@ -563 +575 @@
 }
 int NSAPIGetSettingsInt(const char* section, const char* key, int defaultValue) {
-  return Settings::getInstance()->getInt(section, key, defaultValue);
+  try {
+    return Settings::getInstance()->getInt(section, key, defaultValue);
+  } catch (SettingsException e) {
+    NSC_LOG_ERROR_STD("Failed to set settings file" + e.getMessage());
+  }
 }
 NSCAPI::errorReturn NSAPIGetBasePath(char*buffer, unsigned int bufLen) {