Changeset 482e07e in nscp

Timestamp:

06/16/12 13:11:33 (12 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

796c188, 91f567f

Parents:

b67d231

Message:

• Improved error handling in performance counters #436
• Improved parsing of "legacy command lines"

Files:

• changelog (modified) (1 diff)
• include/pdh/query.hpp (modified) (2 diffs)
• modules/CheckExternalScripts/commands.hpp (modified) (2 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -2 +2 @@
  * Process times and similar ?
  * Fix configuration GUI (low priority)
- * Fixa dependonservice LanManWorkStation (old win)
+ * Fix dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-06-12 MickeM
+ * Improved error handling in performance counters #436
+ * Improved parsing of "legacy command lines"
 
 2012-06-12 MickeM

include/pdh/query.hpp

@@ -37 +37 @@
     CounterList counters_;
     PDH::PDH_HQUERY hQuery_;
+    bool hasDisplayedInvalidCOunter_;
   public:
-    PDHQuery() : hQuery_(NULL) {
+    PDHQuery() : hQuery_(NULL), hasDisplayedInvalidCOunter_(false) {
     }
     virtual ~PDHQuery(void) {
@@ -106 +107 @@
           status = (*it)->collect();
         }
-        if (status.is_error()) {
-          throw PDHException(_T("Failed to poll counter: "), status);
+        if (status.is_negative_denominator()) {
+          if (!hasDisplayedInvalidCOunter_) {
+            hasDisplayedInvalidCOunter_ = true;
+            throw PDHException(_T("Negative denominator issue (check FAQ for ways to solve this): ") + (*it)->getName(), status);
+          }
+        } else if (status.is_error()) {
+          throw PDHException(_T("Failed to poll counter: ") + (*it)->getName(), status);
         }
       }

modules/CheckExternalScripts/commands.hpp

@@ -72 +72 @@
       std::wstringstream ss;
       ss << alias << _T("[") << alias << _T("] = ") 
-        << _T("{command: ") << command 
-        << _T(", arguments: ") << get_argument();
-        if (!user.empty()) {
-          ss << _T(", user: ") << user 
-          << _T(", domain: ") << domain 
-          << _T(", password: ") << password;
-        }
-        ss << _T("}");
+        << _T("{command: ") << command
+        << _T(", arguments: ");
+      bool first = true;
+      BOOST_FOREACH(const std::wstring &s, arguments) {
+        if (first)
+          first = false;
+        else 
+          ss << L', ';
+        ss << s;
+      }
+      if (!user.empty()) {
+        ss << _T(", user: ") << user 
+        << _T(", domain: ") << domain 
+        << _T(", password: ") << password;
+      }
+      ss << _T("}");
       return ss.str();
     }
@@ -96 +104 @@
         }
         arguments.clear();
+        std::list<std::wstring> buffer;
         BOOST_FOREACH(std::wstring s, list) {
-          arguments.push_back(s);
+          std::size_t len = s.length();
+          if (buffer.empty()) {
+            if (len > 2 && s[0] == L'\"' && s[len-1]  == L'\"') {
+              buffer.push_back(s.substr(1, len-2));
+            } else if (len > 1 && s[0] == L'\"') {
+              buffer.push_back(s);
+            } else {
+              arguments.push_back(s);
+            }
+          } else {
+            if (len > 1 && s[len-1] == L'\"') {
+              std::wstring tmp;
+              BOOST_FOREACH(const std::wstring &s2, buffer) {
+                if (tmp.empty()) {
+                  tmp = s2.substr(1);
+                } else {
+                  tmp += _T(" ") + s2;
+                }
+              }
+              arguments.push_back(tmp + _T(" ") + s.substr(0, len-1));
+              buffer.clear();
+            } else {
+              buffer.push_back(s);
+            }
+          }
+        }
+        if (!buffer.empty()) {
+          BOOST_FOREACH(const std::wstring &s, buffer) {
+            arguments.push_back(s);
+          }
         }
       }

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,175
-#define STRPRODUCTVER  "0,4,0,175"
-#define STRPRODUCTDATE "2012-06-12"
+#define PRODUCTVER     0,4,0,177
+#define STRPRODUCTVER  "0,4,0,177"
+#define STRPRODUCTDATE "2012-06-16"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=175
-date=2012-06-12
+build=177
+date=2012-06-16