Changeset c3057cd in nscp

Timestamp:

03/05/08 19:15:13 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

a88c550

Parents:

8c7d67f

Message:

+ Added <> (same as ! and !=) as NRPE breaks the use of ! (in "all" numeric filters (eventlog))

Try using: filter-eventType=<>warning to remove everything that is not a warning

• Fixed two spelling misstakes in the SysTray module.

Files:

• changelog (modified) (1 diff)
• include/filter_framework.hpp (modified) (1 diff)
• modules/SysTray/SysTray.cpp (modified) (1 diff)

changelog

@@ -12 +12 @@
  * Fixed an issue with eventlog and . matching.
  + Added shorthand ! for != in "all" numeric filters (eventlog)
+ + Added <> (same as ! and !=) as NRPE breaks the use of ! (in "all" numeric filters (eventlog))
+   Try using: filter-eventType=<>warning to remove everything that is not a warning
+ * Fixed two spelling misstakes in the SysTray module.
  
 2008-02-26 MickeM

include/filter_framework.hpp

@@ -310 +310 @@
       } else if (value.substr(0,2) == _T("!=")) {
         neq = value.substr(2);
+      } else if (value.substr(0,2) == _T("<>")) {
+        neq = value.substr(2);
       } else if (value.substr(0,1) == _T("!")) {
         neq = value.substr(1);

modules/SysTray/SysTray.cpp

@@ -38 +38 @@
   try {
     if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
-      NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray wont be loaded. Run ") SZAPPNAME _T(" SysTray install ti change this."));
+      NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
       return true;
     }
   } catch (serviceControll::SCException e) {
-    NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray wont be loaded. Run ") SZAPPNAME _T(" SysTray install ti change this."));
+    NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
     return true;
   }