Changeset bf6e9b4 in nscp

Timestamp:

02/02/08 13:54:12 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

52215d7

Parents:

5ac88c0a

Message:

2008-02-02 MickeM

• Might have fixed the "missing eventlog messages" problem.

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (3 diffs)
• include/error.hpp (modified) (2 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (9 diffs)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,0,12
-#define PRODUCTVER     0,3,0,12
-#define STRFILEVER     _T("0.3.0.12")
-#define STRPRODUCTVER  _T("0.3.0.12")
-#define STRPRODUCTDATE  _T("2007-12-11")
+#define FILEVER        0,3,0,24
+#define PRODUCTVER     0,3,0,24
+#define STRFILEVER     _T("0.3.0.24")
+#define STRPRODUCTVER  _T("0.3.0.24")
+#define STRPRODUCTDATE  _T("2008-02-02")
 #endif // AUTOBUILD_H

changelog

@@ -6 +6 @@
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
 
+2008-02-02 MickeM
+ * Might have fixed the "missing eventlog messages" problem.
+
 2008-01-27 MickeM
  * Fixed a memory-leak in format_time
@@ -12 +15 @@
    For this to work you need to have the descriptions flag set
    In short: /nrpe -H 192.168.0.147 -c checkEventLog -a truncate=1024 "syntax=%generated%: %message%" descriptions=true file=System MaxWarn=1 MaxCrit=1 filter+eventType==error filter+generated=\<12h filter=new filter=all filter=in
+ + Added option "unique" to CheckEventLog If this is present only unique errors will be returned.
+   The uniqueness is defined by event-log, event-source, event-id and event-category.
 
 2007-12-16 MickeM
@@ -18 +23 @@
 
 2007-12-11 MickeM
- + Added support for index-lookups of PDH counters (hopefully *all* local problems are now fixed (yeah right))
+ + Added support for index-lookups of PDH counters (hopefully *all* locale problems are now fixed (yeah right))
 
 2007-12-10 MickeM

include/error.hpp

@@ -34 +34 @@
       LPVOID lpMsgBuf;
       HMODULE hevt = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
+      if (hevt == NULL) {
+        return _T("failed to load: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
+      }
       unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_ARGUMENT_ARRAY,hevt,
         dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
@@ -50 +53 @@
     public:
       static std::wstring from_module(std::wstring module, unsigned long dwError, DWORD *arguments) {
+        HMODULE hDLL = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
+        if (hDLL == NULL) {
+          return _T("failed to load: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
+        }
         LPVOID lpMsgBuf;
-        HMODULE hevt = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
-        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_ARGUMENT_ARRAY,hevt,
+        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY,hDLL,
           dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
         if (dwRet == 0) {
-          FreeLibrary(hevt);
-          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from DLL: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
+          FreeLibrary(hDLL);
+          DWORD err = GetLastError();
+          if (err == 317) {
+            return _T("");
+          }
+          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from DLL: ") + module + _T("( reson: ") + strEx::itos(err) + _T(")");
         }
         std::wstring str = reinterpret_cast<TCHAR*>(lpMsgBuf);
         LocalFree(lpMsgBuf);
-        FreeLibrary(hevt);
+        FreeLibrary(hDLL);
+        return str;
+      }
+      static std::wstring from_system(unsigned long dwError, DWORD *arguments) {
+        LPVOID lpMsgBuf;
+        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY,NULL,
+          dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
+        if (dwRet == 0) {
+          DWORD err = GetLastError();
+          if (err == 317) {
+            return _T("");
+          }
+          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from system ( reson: ") + strEx::itos(err) + _T(")");
+        }
+        std::wstring str = reinterpret_cast<TCHAR*>(lpMsgBuf);
+        LocalFree(lpMsgBuf);
         return str;
       }

modules/CheckEventLog/CheckEventLog.cpp

@@ -28 +28 @@
 #include <utils.h>
 #include <error.hpp>
+#include <map>
 
 CheckEventLog gCheckEventLog;
@@ -56 +57 @@
   return false;
 }
-
 
 
@@ -225 +225 @@
       p += len+1;
     }
-    std::wstring ret = error::format::message::from_module(get_dll(), eventID(), dwArgs);
+
+/*
+    TCHAR **_sz = (TCHAR**)GlobalAlloc(GPTR, (pevlr_->NumStrings)*sizeof(TCHAR *));
+    register UINT z;
+    TCHAR* p = reinterpret_cast<TCHAR*>(reinterpret_cast<LPBYTE>(pevlr_) + pevlr_->StringOffset);
+    for(unsigned int z = 0; z < pevlr_->NumStrings; z++) {
+      DWORD len = wcslen(p);
+      _sz[z] = (TCHAR *)GlobalAlloc(GPTR, (len+1) * sizeof(TCHAR));
+      wcscpy_s(_sz[z], len, p);
+      p += len+1;
+    }
+*/
+    std::wstring ret;
+    strEx::splitList dlls = strEx::splitEx(get_dll(), _T(";"));
+    for (strEx::splitList::const_iterator cit = dlls.begin(); cit != dlls.end(); ++cit) {
+      //std::wstring msg = error::format::message::from_module((*cit), eventID(), _sz);
+      std::wstring msg = error::format::message::from_module((*cit), eventID(), dwArgs);
+      if (msg.empty()) {
+        msg = error::format::message::from_module((*cit), pevlr_->EventID, dwArgs);
+      }
+      strEx::replace(msg, _T("\n"), _T(" "));
+      strEx::replace(msg, _T("\t"), _T(" "));
+      std::string::size_type pos = msg.find_last_not_of(_T("\n\t "));
+      if (pos != std::string::npos) {
+        msg = msg.substr(0,pos);
+      }
+      if (!msg.empty()) {
+        if (!ret.empty())
+          ret += _T(", ");
+        ret += msg;
+      }
+    }
     delete [] dwArgs;
-    std::string::size_type pos = ret.find_last_not_of(_T("\n\t\m"));
-    if (pos != std::string::npos) {
-      ret = ret.substr(0,pos-1);
-    }
     return ret;
   }
@@ -274 +301 @@
   }
 };
+/*
+return (pevlr_->EventID&0xffff);
+}
+inline DWORD severity() const {
+return (pevlr_->EventID>>30);
+*/
+class uniq_eventlog_record {
+  DWORD ID;
+  WORD type;
+  WORD category;
+public:
+  uniq_eventlog_record(EVENTLOGRECORD *pevlr) : ID(pevlr->EventID&0xffff), type(pevlr->EventType), category(pevlr->EventCategory) {}
+  bool operator< (const uniq_eventlog_record &other) const { 
+    return (ID < other.ID) || ((ID==other.ID)&&(type < other.type)) || (ID==other.ID&&type==other.type)&&(category < other.category);
+  }
+  std::wstring to_string() const {
+    return _T("id=") + strEx::itos(ID) + _T("type=") + strEx::itos(type) + _T("category=") + strEx::itos(category);
+  }
+};
+typedef std::map<uniq_eventlog_record,bool> uniq_eventlog_map;
 
 
@@ -332 +379 @@
   bool bFilterNew = false;
   bool bShowDescriptions = false;
+  bool unique = false;
   unsigned int truncate = 0;
   std::wstring syntax;
@@ -338 +386 @@
   const int filter_normal = 3;
   const int filter_compat = 3;
-  NSC_DEBUG_MSG_STD(_T("000") + message) ;
 
   try {
@@ -344 +391 @@
       MAP_OPTIONS_NUMERIC_ALL(query, _T(""))
       MAP_OPTIONS_STR2INT(_T("truncate"), truncate)
+      MAP_OPTIONS_BOOL_TRUE(_T("unique"), unique)
       MAP_OPTIONS_BOOL_TRUE(_T("descriptions"), bShowDescriptions)
       MAP_OPTIONS_PUSH(_T("file"), files)
@@ -402 +450 @@
       return NSCAPI::returnUNKNOWN;
     }
+    uniq_eventlog_map uniq_records;
 
     //DWORD dwThisRecord;
@@ -464 +513 @@
           match = true;
         }
+        if (match&&unique) {
+          uniq_eventlog_record record = pevlr;
+          uniq_eventlog_map::const_iterator cit = uniq_records.find(record);
+          if (cit != uniq_records.end()) {
+            match = false;
+          }
+          else
+            uniq_records[record] = true;
+        }
 
         if (match) {