Changeset 50a5db2 in nscp

Timestamp:

01/17/10 15:26:29 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

ef0e24b

Parents:

6822839

Message:

Fixed some logica issues and changed so debug logging work on *nix (cout -> wcout)

Files:

• include/NSCHelper.cpp (modified) (1 diff)
• modules/CheckHelpers/CheckHelpers.cpp (modified) (2 diffs)
• modules/Scheduler/Scheduler.cpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (3 diffs)

include/NSCHelper.cpp

@@ -108 +108 @@
 bool NSCHelper::report::matches(unsigned int report, NSCAPI::nagiosReturn code) {
   return (
-    (code == NSCAPI::returnOK && (report&REPORT_OK)==REPORT_OK) ||
+    (code == NSCAPI::returnOK && ((report&REPORT_OK)==REPORT_OK) ) ||
     (code == NSCAPI::returnCRIT && ((report&REPORT_ERROR)==REPORT_ERROR) ) ||
     (code == NSCAPI::returnWARN && ((report&REPORT_WARNING)==REPORT_WARNING) ) ||

modules/CheckHelpers/CheckHelpers.cpp

@@ -47 +47 @@
     NSCModuleHelper::registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
     NSCModuleHelper::registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
+    NSCModuleHelper::registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
     NSCModuleHelper::registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
     NSCModuleHelper::registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
@@ -93 +94 @@
     return NSCAPI::returnOK;
   } else if (command == _T("CheckOK")) {
+    return checkSimpleStatus(NSCAPI::returnOK, argLen, char_args, msg, perf);
+  } else if (command == _T("check_ok")) {
     return checkSimpleStatus(NSCAPI::returnOK, argLen, char_args, msg, perf);
   } else if (command == _T("CheckWARNING")) {

modules/Scheduler/Scheduler.cpp

@@ -124 +124 @@
     std::wstring msg, perf;
     NSCAPI::nagiosReturn code = NSCModuleHelper::InjectCommand(item.command.c_str(), item.arguments, msg, perf);
+    std::wcout << _T("Testing: ") << item.report << _T(" .. ") << code << _T("?") << std::endl;
     if (NSCHelper::report::matches(item.report, code)) {
       NSCModuleHelper::NotifyChannel(item.channel, item.alias, code, msg, perf);

service/NSClient++.cpp

@@ -378 +378 @@
       return nRetCode;
     } else if ( wcscasecmp( _T("test"), argv[1]+1 ) == 0 ) {
+      g_bConsoleLog = true;
       bool server = false;
       if (argc > 2 && wcscasecmp( _T("server"), argv[2] ) == 0 ) {
@@ -394 +395 @@
 #endif
       nsclient::simple_client client(&mainClient);
-      g_bConsoleLog = true;
       client.start();
       return 0;
@@ -1205 +1205 @@
       }
       if (g_bConsoleLog) {
-        std::string k = "?";
+        std::wstring k = _T("?");
         switch (msgType) {
         case NSCAPI::critical:
-          k ="c";
+          k =_T("c");
           break;
         case NSCAPI::warning:
-          k ="w";
+          k =_T("w");
           break;
         case NSCAPI::error:
-          k ="e";
+          k =_T("e");
           break;
         case NSCAPI::log:
-          k ="l";
+          k =_T("l");
           break;
         case NSCAPI::debug:
-          k ="d";
+          k =_T("d");
           break;
-        } 
-        std::cout << k << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
+        default:
+          k =_T("?");
+        }
+        std::wcout << k << _T(" ") << file_stl << _T("(") << line << _T(") ") << message << std::endl;
       }
       if (!plugins_loaded_) {