Changeset 7f596ce in nscp

Timestamp:

03/08/08 09:31:19 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

febff5f

Parents:

a88c550

Message:

• Changed so log is now in unicode format

Hopefully this will make it simpler to diagnose PDH issues in "strange locales".
If anyone hates this let me know and I will add an option to use "old ansi log".

• Fixed so the console is logged as ANSI (properly) and all unicodes are discarded. This means "strangness" in unicode and non-us-ascii chars on the console,

so for details refer to the log-file which is proper unicode.

+ Since log module is loaded "after" the client has booted I added a "hello" message that prints the current version

(if you find this annoying let me know, I will make it optional :)

Files:

• AutoBuild.h (modified) (1 diff)
• NSClient++.cpp (modified) (4 diffs)
• changelog (modified) (1 diff)
• include/filter_framework.hpp (modified) (3 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• modules/SysTray/SysTray.cpp (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,1,5
-#define PRODUCTVER     0,3,1,5
-#define STRFILEVER     _T("0.3.1.5")
-#define STRPRODUCTVER  _T("0.3.1.5")
-#define STRPRODUCTDATE  _T("2008-02-26")
+#define FILEVER        0,3,1,9
+#define PRODUCTVER     0,3,1,9
+#define STRFILEVER     _T("0.3.1.9")
+#define STRPRODUCTVER  _T("0.3.1.9")
+#define STRPRODUCTDATE  _T("2008-03-06")
 #endif // AUTOBUILD_H

NSClient++.cpp

@@ -120 +120 @@
     } else if ( _wcsicmp( _T("test"), argv[1]+1 ) == 0 ) {
       std::wcout << "Launching test mode..." << std::endl;
+      LOG_MESSAGE_STD(_T("Booting: " SZSERVICEDISPLAYNAME ));
       try {
         if (serviceControll::isStarted(SZSERVICENAME)) {
@@ -135 +136 @@
       LOG_MESSAGE_STD(_T("Using settings from: ") + Settings::getInstance()->getActiveType());
       LOG_MESSAGE(_T("Enter command to inject or exit to terminate..."));
+
       std::wstring s = _T("");
       std::wstring buff = _T("");
@@ -153 +155 @@
           std::wstring msg, perf;
           NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ' ', true, msg, perf);
-          if (perf.empty())
-            std::wcout << NSCHelper::translateReturn(ret) << _T(":") << msg << std::endl;
-          else
-            std::wcout << NSCHelper::translateReturn(ret) << _T(":") << msg << _T("|") << perf << std::endl;
+          std::wcout << NSCHelper::translateReturn(ret) << _T(":");
+          std::cout << strEx::wstring_to_string(msg);
+          if (!perf.empty())
+            std::cout << "|" << strEx::wstring_to_string(perf);
+          std::wcout << std::endl;
           buff = _T("");
         } else {
@@ -593 +596 @@
     }
     if (g_bConsoleLog) {
-      std::wstring k = _T("?");
+      std::string k = "?";
       switch (msgType) {
       case NSCAPI::critical:
-        k =_T("c");
+        k ="c";
         break;
       case NSCAPI::warning:
-        k =_T("w");
+        k ="w";
         break;
       case NSCAPI::error:
-        k =_T("e");
+        k ="e";
         break;
       case NSCAPI::log:
-        k =_T("l");
+        k ="l";
         break;
       case NSCAPI::debug:
-        k =_T("d");
+        k ="d";
         break;
-      }
-      std::wcout << k << _T(" ") << file_stl << _T("(") << line << _T(") ") << message << std::endl;
+      } 
+      std::cout << k << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
     }
     for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {

changelog

@@ -6 +6 @@
  * Improved socket performance (would be nice if we could be used as a "hub")
  * "The message is blocked by User Interface Privilege Isolation, Administrative applications that need to see it can allow it through by calling ChangeWindowMessageFilter after making sure the necessary security precautions are in place. "
+
+2008-03-08 MickeM
+ * Changed so log is now in unicode format
+   Hopefully this will make it simpler to diagnose PDH issues in "strange locales".
+   If anyone hates this let me know and I will add an option to use "old ansi log".
+ * Fixed so the console is logged as ANSI (properly) and all unicodes are discarded.
+   This means "strangness" in unicode and non-us-ascii chars on the console,
+    so for details refer to the log-file which is proper unicode.
+ + Since log module is loaded "after" the client has booted I added a "hello" message that prints the current version
+    (if you find this annoying let me know, I will make it optional :)
+
+2008-03-06 MickeM
+ * Fixed silly ordering bug with the <> syntax.
 
 2008-03-05 MickeM

include/filter_framework.hpp

@@ -205 +205 @@
         hasFilter_ = true;
       } catch (handlers::handler_exception e) {
-        throw parse_exception(e.getMessage());
+        throw parse_exception(e.getMessage() + _T(": ") + value);
+      } catch (...) {
+        throw parse_exception(_T("Unknown parse exception: ") + value);
       }
       return *this;
@@ -304 +306 @@
       if (value.substr(0,1) == _T(">")) {
         max = value.substr(1);
+      } else if (value.substr(0,2) == _T("<>")) {
+        neq = value.substr(2);
       } else if (value.substr(0,1) == _T("<")) {
         min = value.substr(1);
@@ -309 +313 @@
         eq = value.substr(1);
       } 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("!")) {

modules/CheckEventLog/CheckEventLog.cpp

@@ -349 +349 @@
   std::wstring getValue() const {
     if (eventSource.hasFilter())
-      return eventSource.getValue();
+      return _T("event-source: ") + eventSource.getValue();
     if (eventType.hasFilter())
-      return eventType.getValue();
+      return _T("event-type: ") + eventType.getValue();
     if (eventSeverity.hasFilter())
-      return eventSeverity.getValue();
+      return _T("severity: ") + eventSeverity.getValue();
     if (eventID.hasFilter())
-      return eventID.getValue();
+      return _T("event-id: ") + eventID.getValue();
     if (message.hasFilter())
-      return message.getValue();
+      return _T("message: ") + message.getValue();
     if (timeWritten.hasFilter())
-      return timeWritten.getValue();
+      return _T("time-written: ") + timeWritten.getValue();
     if (timeGenerated.hasFilter())
-      return timeGenerated.getValue();
+      return _T("time-generated: ") + timeGenerated.getValue();
     return _T("UNknown...");
   }

modules/SysTray/SysTray.cpp

@@ -106 +106 @@
       hWnd = hLogWnd;
     } else {
-      std::cout << "Fuck!!!" << std::endl;
+      std::cout << "Damnit!!!" << std::endl;
       NSC_LOG_ERROR_STD(_T("Failed to get mutex in logger, message discarded"));
     }