Changeset dff5db9 in nscp for NSClient++.cpp

Timestamp:

06/15/08 14:09:36 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

e1ef872

Parents:

8f167e8

Message:

2008-06-14 MickeM

• Fixed error message from external commands (better reporting now)

2008-05-14 MickeM

• Fixed memoryleak in the service checker.

I am really sorry I usualy write better code then this.

File:

• NSClient++.cpp (modified) (3 diffs)

NSClient++.cpp

@@ -26 +26 @@
 NSClient mainClient;  // Global core instance.
 bool g_bConsoleLog = false;
-//////////////////////////////////////////////////////////////////////////
-// Startup code
-
-#define XNSC_DEFINE_SETTING_KEY(name, tag) \
-  name ## _SECTION \
-
-#define DEFINE_SETTING_S(name, section, key, value) \
-  const std::wstring name ## _SECTION = section; \
-  const std::wstring name = key; \
-  const std::wstring name ## _DEFAULT = value;
-
-DEFINE_SETTING_S(NSCLIENT_TEST2, NSCLIENT_SECTION_TITLE, _T("bind_to_address"), _T(""))
-
-
-
-
-#define NSCLIENT_TEST _T("bind_to_address")
-#define NSCLIENT_TEST_DEFAULT _T("xxx")
-#define NSCLIENT_TEST_SECTION NSCLIENT_SECTION_TITLE
-
-#define SETTINGS_KEY(key) \
-  key ## _SECTION, key, key ## _DEFAULT
 
 /**
@@ -156 +134 @@
       LOG_MESSAGE(_T("Enter command to inject or exit to terminate..."));
 
-      std::wstring str1 = Settings::getInstance()->getString(SETTINGS_KEY(NSCLIENT_TEST));
-      std::wcout << str1 << std::endl;
-      std::wstring str2 = Settings::getInstance()->getString(SETTINGS_KEY(NSCLIENT_TEST2));
-      std::wcout << str2 << std::endl;
-
       std::wstring s = _T("");
       std::wstring buff = _T("");
@@ -179 +152 @@
           std::wstring msg, perf;
           NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ' ', true, msg, perf);
-          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;
+          if (ret == NSCAPI::returnIgnored) {
+            std::wcout << _T("No handler for command: ") << t.first << std::endl;
+          } else {
+            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 {