Changeset 440c0cb in nscp

Timestamp:

04/05/12 07:16:26 (14 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

682ccd2

Parents:

acc2c60

Message:

• Fixed issue with empty filters in active eventlog
• Resolved some issues with loggingin default set to debug.
• Fixed so --debug actually works
• Added --log-to-file and set "nscp test" to not log to file.
• Fixed typo related to allow arguments option
• Added levels to comment for log level in config.

Files:

• changelog (modified) (1 diff)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (1 diff)
• helpers/installers/installer/Product.wxs (modified) (2 diffs)
• include/NSCAPI.h (modified) (1 diff)
• include/nscapi/nscapi_core_wrapper.cpp (modified) (1 diff)
• include/nscapi/nscapi_helper.cpp (modified) (3 diffs)
• include/nscapi/nscapi_protobuf_functions.hpp (modified) (1 diff)
• include/nscapi/settings_proxy.hpp (modified) (1 diff)
• include/nsclient/base_logger_impl.cpp (modified) (2 diffs)
• include/nsclient/base_logger_impl.hpp (modified) (1 diff)
• include/nsclient/logger.hpp (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)
• modules/NRPEServer/handler_impl.cpp (modified) (1 diff)
• modules/NSCPServer/CMakeLists.txt (modified) (1 diff)
• modules/NSClientServer/CMakeLists.txt (modified) (1 diff)
• modules/NSClientServer/NSClientServer.cpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (3 diffs)
• service/NSClient++.h (modified) (1 diff)
• service/cli_parser.hpp (modified) (8 diffs)
• service/logger_impl.cpp (modified) (2 diffs)
• service/settings_client.hpp (modified) (1 diff)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -5 +5 @@
  * Fix RtlStringFromGUID problem on NT4
 
+2012-04-04 MickeM
+ * Fixed issue with empty filters in active eventlog
+
+2012-04-04 MickeM
+ * Resolved some issues with loggingin default set to debug.
+ * Fixed so --debug actually works
+ * Added --log-to-file and set "nscp test" to not log to file.
+ * Fixed typo related to allow arguments option
+ * Added levels to comment for log level in config.
 
 2012-04-01 MickeM

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -33 +33 @@
 
 std::string nsclient::logging::logger_helper::create(NSCAPI::log_level::level level, const char* file, const int line, std::wstring message) {
-  if (level < NSCAPI::log_level::log)
+  if (level < NSCAPI::log_level::info)
     return "E" + utf8::cvt<std::string>(message);
   return "I" + utf8::cvt<std::string>(message);

helpers/installers/installer/Product.wxs

@@ -121 +121 @@
               <File Id="NSCAServerDLL" Name="NSCAServer.dll" DiskId="1" Source="$(var.Source)/modules/NSCAServer.dll" Vital="no" />
               <File Id="SchedulerDLL" Name="Scheduler.dll" DiskId="1" Source="$(var.Source)/modules/Scheduler.dll" Vital="no" />
-            </Component>
-            <Component Id="NSCP" Guid="B185B8F1-3718-4e8e-ADA4-38049A0721EA" Win64="$(var.Win64)">
-              <File Id="NSCPClientDLL" Name="NSCPClient.dll" DiskId="1" Source="$(var.Source)/modules/NSCPClient.dll" Vital="no" />
-              <File Id="NSCPServerDLL" Name="NSCPServer.dll" DiskId="1" Source="$(var.Source)/modules/NSCPServer.dll" Vital="no" />
             </Component>
             <Component Id="PythonScript" Guid="49C2120D-634D-48ef-B82E-F2E9B219A768" Win64="$(var.Win64)">
@@ -268 +264 @@
           <ComponentRef Id="ExtraClients" />
         </Feature>
-        <Feature Id="NSCPPlugin" Title="NSCP plugin (experimental)" Description="Plugin to submit passive results to an NSCP server" Level="1" Absent="disallow">
-          <ComponentRef Id="NSCP" />
-        </Feature>
         <Feature Id="PythonScript" Title="Python Scripting" Description="Python scripting requires python to be installed)" Level="1" Absent="disallow">
           <ComponentRef Id="PythonScript" />

include/NSCAPI.h

@@ -101 +101 @@
     const int error = 10; // Error
     const int warning = 50; // Warning      <<< Default for command line interface
-    const int log = 100;  // Log message    <<< Default for service
+    //const int log = 100;  // Log message    <<< Default for service
     const int info = 150; // information
     const int debug = 500;  // Debug messages <<< Default for test

include/nscapi/nscapi_core_wrapper.cpp

@@ -41 +41 @@
 bool nscapi::core_wrapper::should_log(NSCAPI::nagiosReturn msgType) {
   enum log_status {unknown, set };
-  static NSCAPI::log_level::level level = NSCAPI::log_level::log;
+  static NSCAPI::log_level::level level = NSCAPI::log_level::info;
   static log_status status = unknown;
   if (status == unknown) {

include/nscapi/nscapi_helper.cpp

@@ -90 +90 @@
     PARSE_LOGLEVEL_BEGIN()
       PARSE_LOGLEVEL("all",   NSCAPI::log_level::trace)
-      PARSE_LOGLEVEL("normal",  NSCAPI::log_level::info)
-      PARSE_LOGLEVEL("service", NSCAPI::log_level::log)
-      PARSE_LOGLEVEL("log",   NSCAPI::log_level::log)
-      PARSE_LOGLEVEL("message", NSCAPI::log_level::info)
       PARSE_LOGLEVEL("error",   NSCAPI::log_level::error)
       PARSE_LOGLEVEL("critical",  NSCAPI::log_level::critical)
@@ -115 +111 @@
   RENDER_LOGLEVEL_BEGIN()
     RENDER_LOGLEVEL("all",    NSCAPI::log_level::trace)
-    RENDER_LOGLEVEL("normal", NSCAPI::log_level::info)
-    RENDER_LOGLEVEL("log",    NSCAPI::log_level::log)
-    RENDER_LOGLEVEL("message",  NSCAPI::log_level::info)
     RENDER_LOGLEVEL("error",    NSCAPI::log_level::error)
     RENDER_LOGLEVEL("critical", NSCAPI::log_level::critical)
@@ -182 +175 @@
     case NSCAPI::log_level::warning:
       return _T("warning");
-    case NSCAPI::log_level::log:
-      return _T("message");
+    case NSCAPI::log_level::info:
+      return _T("info");
+    case NSCAPI::log_level::trace:
+      return _T("trace");
     case NSCAPI::log_level::debug:
       return _T("debug");

include/nscapi/nscapi_protobuf_functions.hpp

@@ -85 +85 @@
         if (ret == NSCAPI::log_level::error)
           return Plugin::LogEntry_Entry_Level_LOG_ERROR;
-        if (ret == NSCAPI::log_level::log)
-          return Plugin::LogEntry_Entry_Level_LOG_INFO;
         if (ret == NSCAPI::log_level::info)
           return Plugin::LogEntry_Entry_Level_LOG_INFO;

include/nscapi/settings_proxy.hpp

@@ -58 +58 @@
     }
     virtual void info(const char* file, int line, std::wstring message)  {
-      core_->log(NSCAPI::log_level::log, file, line, message);
+      core_->log(NSCAPI::log_level::info, file, line, message);
     }
     virtual void debug(const char* file, int line, std::wstring message)  {

include/nsclient/base_logger_impl.cpp

@@ -11 +11 @@
     case NSCAPI::log_level::error:
       return _T("e");
-    case NSCAPI::log_level::log:
-      return _T("l");
     case NSCAPI::log_level::info:
       return _T("l");
@@ -30 +28 @@
     case NSCAPI::log_level::warning:
       return _T("warning");
-    case NSCAPI::log_level::log:
-      return _T("message");
     case NSCAPI::log_level::info:
       return _T("message");

include/nsclient/base_logger_impl.hpp

@@ -17 +17 @@
       bool console_log_;
     public:
-      logging_interface_impl() : level_(NSCAPI::log_level::trace), console_log_(false) {}
+      logging_interface_impl() : level_(NSCAPI::log_level::info), console_log_(false) {}
 
 

include/nsclient/logger.hpp

@@ -41 +41 @@
       static void set_log_level(std::wstring level);
 
+      static void set_backend(std::string backend);
+      static void destroy();
+
     };
   }

modules/CheckEventLog/CheckEventLog.cpp

@@ -332 +332 @@
     c.filter = key;
     filters_.push_back(c);
+  } else if (key.empty() && query.empty()) {
+    return;
   } else {
     c.alias = key;

modules/CheckEventLog/CheckEventLog.h

@@ -87 +87 @@
   void set_language(std::string lang);
   void set_filter(std::wstring flt) {
-    add_realtime_filter(_T("filter"), flt);
+    if (!flt.empty())
+      add_realtime_filter(_T("filter"), flt);
   }
   bool has_filters() {

modules/NRPEServer/handler_impl.cpp

@@ -15 +15 @@
   if (!allowArgs_) {
     if (!cmd.second.empty()) {
-      NSC_LOG_ERROR(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
-      throw nrpe::nrpe_exception(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
+      NSC_LOG_ERROR(_T("Request contained arguments (not currently allowed, check the allow arguments option)."));
+      throw nrpe::nrpe_exception(_T("Request contained arguments (not currently allowed, check the allow arguments option)."));
     }
   }

modules/NSCPServer/CMakeLists.txt

@@ -24 +24 @@
 
 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+IF(OPENSSL_FOUND)
+  ADD_DEFINITIONS(-DUSE_SSL)
+ENDIF(OPENSSL_FOUND)
 
 IF(WIN32)

modules/NSClientServer/CMakeLists.txt

@@ -23 +23 @@
 
 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+IF(OPENSSL_FOUND)
+  ADD_DEFINITIONS(-DUSE_SSL)
+ENDIF(OPENSSL_FOUND)
 
 IF(WIN32)

modules/NSClientServer/NSClientServer.cpp

@@ -78 +78 @@
       _T("TIMEOUT"), _T("Timeout when reading packets on incoming sockets. If the data has not arrived within this time we will bail out."))
 
-      (_T("use ssl"), sh::bool_key(&info_.use_ssl, true),
+      (_T("use ssl"), sh::bool_key(&info_.use_ssl, false),
       _T("ENABLE SSL ENCRYPTION"), _T("This option controls if SSL should be enabled."))
 

service/NSClient++.cpp

@@ -334 +334 @@
         addPlugin(pluginPath / v.second, v.first);
       } catch (const NSPluginException &e) {
-        LOG_CRITICAL_CORE_STD(_T("Failed to register plugin: ") + e.wwhat());
+        if (e.file_.find(_T("FileLogger")) != std::wstring::npos) {
+          LOG_DEBUG_CORE_STD(_T("Failed to register plugin: ") + e.wwhat());
+        } else {
+          LOG_ERROR_CORE(_T("Failed to register plugin: ") + e.wwhat());
+        }
       } catch (...) {
         LOG_CRITICAL_CORE_STD(_T("Failed to register plugin key: ") + v.second);
@@ -402 +406 @@
     settings.add_key_to_settings(_T("log"))
       (_T("level"), sh::wstring_key(&log_level, _T("info")),
-      _T("LOG LEVEL"), _T("Log level to use"))
+      _T("LOG LEVEL"), _T("Log level to use. Avalible levels are error,warning,info,debug,trace"))
       ;
 
@@ -542 +546 @@
         addPlugin(pluginPath / boost::filesystem::wpath(file), alias);
       } catch(const NSPluginException& e) {
-        LOG_ERROR_CORE_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
+        if (e.file_.find(_T("FileLogger")) != std::wstring::npos) {
+          LOG_DEBUG_CORE_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
+        } else {
+          LOG_ERROR_CORE_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
+        }
       } catch (std::exception e) {
         LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + file + strEx::string_to_wstring(e.what()));

service/NSClient++.h

@@ -177 +177 @@
   std::wstring getFolder(std::wstring key);
   std::wstring expand_path(std::wstring file);
-  void set_console_log() {
-    nsclient::logging::logger::get_logger()->set_console_log(true);
-  }
 
   typedef boost::function<int(plugin_type)> run_function;

service/cli_parser.hpp

@@ -16 +16 @@
   po::options_description common;
   po::options_description unittest;
+  po::options_description test;
 
   bool help;
@@ -21 +22 @@
   std::wstring log_level;
   std::wstring settings_store;
+  bool log_debug;
 
   static nsclient::logging::logger_interface* get_logger() {
@@ -34 +36 @@
     , service("Service Options")
     , client("Client Options")
-    , unittest("Unittest Options")
+    , unittest("Unit-test Options")
+    , test("Test Options")
     , help(false)
     , version(false)
+    , log_debug(false)
   {
     root.add_options()
@@ -42 +46 @@
       ("version", po::bool_switch(&version), "Show version information")
       ;
+
     common.add_options()
       ("settings", po::value<std::wstring>(&settings_store), "Override (temporarily) settings subsystem to use")
       ("help", po::bool_switch(&help), "produce help message")
-      ("debug", "Set log level to debug (and show debug information)")
+      ("debug", po::bool_switch(&log_debug), "Set log level to debug (and show debug information)")
       ("log", po::value<std::wstring>(&log_level), "The log level to use")
       ("version", po::bool_switch(&version), "Show version information")
@@ -84 +89 @@
       ("raw-argument", po::wvalue<std::vector<std::wstring> >(), "List of arguments (does not get -- prefixed)")
       ;
+
     unittest.add_options()
       ("language,l", po::value<std::wstring>()->implicit_value(_T("")), "Language tests are written in")
@@ -90 +96 @@
       ;
 
+    test.add_options()
+      ("log-to-file", "Enable file logger (defaults is console only)")
+      ;
+
   }
 
   bool process_common_options(std::string context, po::options_description &desc) {
-    core_->set_console_log();
+    nsclient::logging::logger::get_logger()->set_console_log(true);
+    if (log_debug) {
+      log_level = _T("debug");
+    }
     if (!log_level.empty())
       nsclient::logging::logger::set_log_level(log_level);
@@ -191 +204 @@
 
   int parse_test(int argc, wchar_t* argv[]) {
-    bool server = false;
+
+    po::options_description all("Allowed options (test)");
+    all.add(common).add(test);
+
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, all), vm);
+    po::notify(vm);
+
     if (log_level.empty())
       log_level  = _T("debug");
 
-    core_->set_console_log();
+    if (process_common_options("test", all))
+      return 1;
+
+    if (vm.count("log-to-file") == 0) {
+      nsclient::logging::logger::set_backend("console");
+    }
+
     try {
       po::options_description all("Allowed options (settings)");
@@ -300 +326 @@
       }
       if (nsclient::logging::logger::get_logger()->should_log(NSCAPI::log_level::debug)) {
-        get_logger()->info(__FILE__, __LINE__, _T("Service name: ") + name);
-        get_logger()->info(__FILE__, __LINE__, _T("Service description: ") + desc);
+        get_logger()->debug(__FILE__, __LINE__, _T("Service name: ") + name);
+        get_logger()->debug(__FILE__, __LINE__, _T("Service description: ") + desc);
       }
 

service/logger_impl.cpp

@@ -212 +212 @@
 
 
+class simple_console_logger : public nsclient::logging::logging_interface_impl {
+  std::string format_;
+public:
+  simple_console_logger() : format_("%Y-%m-%d %H:%M:%S") {
+  }
+
+  void do_log(const std::string &data) {
+    if (get_console_log()) {
+      std::wcout << render_console_message(data) << std::endl;
+    }
+  }
+  void configure() {
+    try {
+      std::wstring file;
+
+      sh::settings_registry settings(settings_manager::get_proxy());
+      settings.set_alias(_T("log/file"));
+
+      settings.add_path_to_settings()
+        (_T("log"),_T("LOG SECTION"), _T("Configure log properties."))
+        ;
+
+      settings.add_key_to_settings(_T("log"))
+        (_T("date format"), sh::string_key(&format_, "%Y-%m-%d %H:%M:%S"),
+        _T("DATEMASK"), _T("The size of the buffer to use when getting messages this affects the speed and maximum size of messages you can recieve."))
+
+        ;
+
+      settings.register_all();
+      settings.notify();
+
+    } catch (nscapi::nscapi_exception &e) {
+      log_fatal(std::string("Failed to register command: ") + e.what());
+    } catch (std::exception &e) {
+      log_fatal(std::string("Exception caught: ") + e.what());
+    } catch (...) {
+      log_fatal("Failed to register command.");
+    }
+  }
+  bool startup() { return true; }
+  bool shutdown() { return true; }
+};
+
+
 
 
@@ -283 +327 @@
 };
 
-static nsclient::logging::logging_interface_impl *impl = NULL;
-
+static nsclient::logging::logging_interface_impl *logger_impl_ = NULL;
+
+#define CONSOLE_BACKEND "console"
+#define THREADED_FILE_BACKEND "threaded-file"
+#define FILE_BACKEND "file"
+
+
+void nsclient::logging::logger::set_backend(std::string backend) {
+  nsclient::logging::logging_interface_impl *tmp = NULL;
+  if (backend == CONSOLE_BACKEND) {
+    tmp = new simple_console_logger();
+  } else if (backend == THREADED_FILE_BACKEND) {
+    tmp = new threaded_logger(log_impl_type(new simple_file_logger("nsclient.log")));
+  } else if (backend == FILE_BACKEND) {
+    tmp = new simple_file_logger("nsclient.log");
+  } else {
+    tmp = new simple_console_logger();
+  }
+  nsclient::logging::logging_interface_impl *old = logger_impl_ ;
+  logger_impl_  = tmp;
+  delete old;
+  old = NULL;
+}
+
+
+#define DEFAULT_BACKEND THREADED_FILE_BACKEND
 nsclient::logging::logging_interface_impl* get_impl() {
-  if (impl == NULL)
-    impl = new threaded_logger(log_impl_type(new simple_file_logger("nsclient.log")));
-  return impl;
+  if (logger_impl_  == NULL)
+    nsclient::logging::logger::set_backend(DEFAULT_BACKEND);
+  return logger_impl_ ;
+}
+void nsclient::logging::logger::destroy() {
+  nsclient::logging::logging_interface_impl* old = logger_impl_;
+  logger_impl_ = NULL;
+  delete old;
 }
 

service/settings_client.hpp

@@ -20 +20 @@
 
     void boot(std::wstring log) {
-      core_->set_console_log();
       if (!current_.empty())
         core_->set_settings_context(current_);

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,153
-#define STRPRODUCTVER  "0,4,0,153"
-#define STRPRODUCTDATE "2012-04-02"
+#define PRODUCTVER     0,4,0,156
+#define STRPRODUCTVER  "0,4,0,156"
+#define STRPRODUCTDATE "2012-04-05"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=153
-date=2012-04-02
+build=156
+date=2012-04-05