Changeset 682ccd2 in nscp

Timestamp:

04/11/12 18:34:18 (13 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

6533c1a

Parents:

440c0cb

Message:

• Fixed crash in new logger
• Fixed a few command line parsing issues (most notably test and --log-to-file)
• Changed default location for process dumps to be a non-elevated location (under common-appdata).
• Fixed (ish) check_nt issue (check_nt really really is broken... this will probably cause problems with people sending large payloads though)

Files:

• changelog (modified) (3 diffs)
• files/old-settings.map (modified) (1 diff)
• include/check_nt/server/parser.hpp (modified) (1 diff)
• include/concurrent_queue.hpp (modified) (1 diff)
• include/settings/settings_old.hpp (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (2 diffs)
• modules/NSClientServer/NSClientServer.cpp (modified) (3 diffs)
• service/NSClient++.cpp (modified) (3 diffs)
• service/cli_parser.hpp (modified) (3 diffs)
• service/logger_impl.cpp (modified) (5 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -4 +4 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-04-10 MickeM
+ * Fixed crash in new logger
+ * Fixed a few command line parsing issues (most notably test and --log-to-file)
+ * Changed default location for process dumps to be a non-elevated location (under common-appdata).
+ * Fixed (ish) check_nt issue (check_nt really really is broken... this will probably cause problems with people sending large payloads though)
+ 
+2012-04-06 MickeM
+ * Easter break!
 
 2012-04-04 MickeM
@@ -23 +32 @@
 2012-03-27 MickeM
  * Removed some annoying "error" messages
- * Tweaked FGileLogger a bit to be more "modern"
+ * Tweaked FileLogger a bit to be more "modern"
  * Changed so file-name expansion is more efficient
  * Changed so modules are defaulted to 0 in config.
- * Log levels are case sensetive
+ * Log levels are case sensitive
  * Fixed so log level is not read from ini file
  * improved plugin processing from ini files
@@ -32 +41 @@
 2012-03-26 MickeM
  * Fixed perfoamcen data parsing issue
- * Fixed external scripts perfoamcen data issue
+ * Fixed external scripts performance data issue
  * Fixed boolen flag handling in settings (default generated as false regardless of actual state)
  * Fixed so "advanced properties" are not generated with --update-defalts

files/old-settings.map

@@ -53 +53 @@
 NRPE/allow_arguments=/settings/NRPE/server/allow arguments
 NRPE/allow_nasty_meta_chars=/settings/NRPE/server/allow nasty characters
-NRPE/use_ssl=/settings/NRPE/server/ssl
+NRPE/use_ssl=/settings/NRPE/server/use ssl
 # NRPE/script_dir
 

include/check_nt/server/parser.hpp

@@ -21 +21 @@
           buffer_.push_back(*begin);
           if (*begin == '\n') {
-            found = true;
             break;
           }
         }
-        return boost::make_tuple(found, begin);
+        return boost::make_tuple(true, begin);
       }
 

include/concurrent_queue.hpp

@@ -42 +42 @@
     }
 
-    popped_value=queue_.front();
-    queue_.pop();
+    if (!queue_.empty()) {
+      popped_value=queue_.front();
+      queue_.pop();
+    }
   }
 

include/settings/settings_old.hpp

@@ -120 +120 @@
         key_map::iterator it1 = keys_.find(new_key);
         if (it1 != keys_.end()) {
-          get_logger()->debug(__FILE__, __LINE__, new_key.first + _T(".") + new_key.second + _T(" found in alias list"));
+          //get_logger()->debug(__FILE__, __LINE__, new_key.first + _T(".") + new_key.second + _T(" found in alias list"));
           return (*it1).second;
         }

modules/CheckSystem/CheckSystem.cpp

@@ -90 +90 @@
       , _T("PDH COUNTERS"), _T(""))
 
-
       ;
-
 
     settings.alias().add_key_to_settings()
@@ -98 +96 @@
       _T("DEFAULT COUNTERS"), _T("Load the default counters: ") PDH_SYSTEM_KEY_CPU _T(", ") PDH_SYSTEM_KEY_MCB _T(", ") PDH_SYSTEM_KEY_MCL _T(" and ") PDH_SYSTEM_KEY_UPT _T(" If not you need to specify these manually. ") )
 
-      (_T("default"), sh::bool_key(&default_counters, true),
-      _T("DEFAULT COUNTERS"), _T("Load the default counters: ") PDH_SYSTEM_KEY_CPU _T(", ") PDH_SYSTEM_KEY_MCB _T(", ") PDH_SYSTEM_KEY_MCL _T(" and ") PDH_SYSTEM_KEY_UPT _T(" If not you need to specify these manually. ") )
-
       (_T("default buffer length"), sh::wstring_key(&data->buffer_length, _T("1h")),
       _T("DEFAULT INTERVALL"), _T("Used to define the default intervall for range buffer checks (ie. CPU)."))
-// 
-//      (_T("hostname cache"), sh::bool_key(&cacheNscaHost_),
-//      _T("CACHE HOSTNAME"), _T(""))
-// 
-//      (_T("delay"), sh::string_fun_key<std::wstring>(boost::bind(&NSCAAgent::set_delay, this, _1), 0),
-//      _T("DELAY"), _T(""))
-// 
-//      (_T("payload length"), sh::uint_key(&payload_length_, 512),
-//      _T("PAYLOAD LENGTH"), _T("The password to use. Again has to be the same as the server or it wont work at all."))
 
       ;
 
-    //std::map<DWORD,std::wstring>::key_type
-
-    settings.alias().add_key_to_settings()
+    settings.alias().add_key_to_settings(_T("service mapping"))
 
       (_T("BOOT_START"), sh::wstring_vector_key(&lookups_, SERVICE_BOOT_START, _T("ignored")),
-      _T("SERVICE_BOOT_START"), _T("TODO"))
+      _T("SERVICE_BOOT_START"), _T("TODO"), true)
 
       (_T("SYSTEM_START"), sh::wstring_vector_key(&lookups_, SERVICE_SYSTEM_START, _T("ignored")),
-      _T("SERVICE_SYSTEM_START"), _T("TODO"))
+      _T("SERVICE_SYSTEM_START"), _T("TODO"), true)
 
       (_T("AUTO_START"), sh::wstring_vector_key(&lookups_, SERVICE_AUTO_START, _T("started")),
-      _T("SERVICE_AUTO_START"), _T("TODO"))
+      _T("SERVICE_AUTO_START"), _T("TODO"), true)
 
       (_T("DEMAND_START"), sh::wstring_vector_key(&lookups_, SERVICE_DEMAND_START, _T("ignored")),
-      _T("SERVICE_DEMAND_START"), _T("TODO"))
+      _T("SERVICE_DEMAND_START"), _T("TODO"), true)
 
       (_T("DISABLED"), sh::wstring_vector_key(&lookups_, SERVICE_DISABLED, _T("stopped")),
-      _T("SERVICE_DISABLED"), _T("TODO"))
+      _T("SERVICE_DISABLED"), _T("TODO"), true)
 
       (_T("DELAYED"), sh::wstring_vector_key(&lookups_, NSCP_SERVICE_DELAYED, _T("ignored")),
-      _T("SERVICE_DELAYED"), _T("TODO"))
+      _T("SERVICE_DELAYED"), _T("TODO"), true)
 
       ;

modules/NSClientServer/NSClientServer.cpp

@@ -58 +58 @@
       ;
 
+
+    settings.alias().add_key_to_settings()
+      (_T("thread pool"), sh::uint_key(&info_.thread_pool_size, 10),
+      _T("THREAD POOL"), _T(""), true)
+
+      (_T("socket queue size"), sh::int_key(&info_.back_log, 0),
+      _T("LISTEN QUEUE"), _T("Number of sockets to queue before starting to refuse new incoming connections. This can be used to tweak the amount of simultaneous sockets that the server accepts."), true)
+
+      (_T("use ssl"), sh::bool_key(&info_.use_ssl, false),
+      _T("ENABLE SSL ENCRYPTION"), _T("This option controls if SSL should be enabled."), true)
+
+      (_T("certificate"), sh::wpath_key(&info_.certificate, _T("${certificate-path}/nrpe_dh_512.pem")),
+      _T("SSL CERTIFICATE"), _T(""), true)
+
+      ;
+
+
+
     settings.alias().add_parent(_T("/settings/default/socket")).add_key_to_settings()
-
-      (_T("thread pool"), sh::uint_key(&info_.thread_pool_size, 10),
-      _T("THREAD POOL"), _T(""))
 
       (_T("bind to"), sh::string_key(&info_.address),
       _T("BIND TO ADDRESS"), _T("Allows you to bind server to a specific local address. This has to be a dotted ip address not a host name. Leaving this blank will bind to all available IP addresses."))
-
-      (_T("socket queue size"), sh::int_key(&info_.back_log, 0),
-      _T("LISTEN QUEUE"), _T("Number of sockets to queue before starting to refuse new incoming connections. This can be used to tweak the amount of simultaneous sockets that the server accepts."))
 
       (_T("allowed hosts"), sh::string_fun_key<std::wstring>(boost::bind(&socket_helpers::allowed_hosts_manager::set_source, &info_.allowed_hosts, _1), _T("127.0.0.1")),
@@ -78 +90 @@
       _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, false),
-      _T("ENABLE SSL ENCRYPTION"), _T("This option controls if SSL should be enabled."))
-
-      (_T("certificate"), sh::wpath_key(&info_.certificate, _T("${certificate-path}/nrpe_dh_512.pem")),
-      _T("SSL CERTIFICATE"), _T(""))
-
       ;
 
@@ -90 +96 @@
       (_T("password"), sh::string_fun_key<std::wstring>(boost::bind(&check_nt::server::handler::set_password, info_.request_handler, _1), _T("")),
       _T("PASSWORD"), _T("Password used to authenticate againast server"))
+
       ;
 

service/NSClient++.cpp

@@ -431 +431 @@
 
       (_T("archive folder"), sh::wpath_key(&crash_folder, CRASH_ARCHIVE_FOLDER),
-      CRASH_ARCHIVE_FOLDER_KEY, _T("The folder to archive crash dumps in"))
+      _T("CRASH ARCHIVE LOCATION"), _T("The folder to archive crash dumps in"))
       ;
 
@@ -538 +538 @@
       std::wstring file = NSCPlugin::get_plugin_file(v.second);
       std::wstring alias = v.first;
-      if (!alias.empty()) {
-        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file + _T(" as ") + alias);
-      } else {
-        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file);
-      }
+//      if (!alias.empty()) {
+//        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file + _T(" as ") + alias);
+//      } else {
+//        LOG_DEBUG_CORE_STD(_T("Processing plugin: ") + file);
+//      }
       try {
         addPlugin(pluginPath / boost::filesystem::wpath(file), alias);
@@ -1410 +1410 @@
     std::wstring::size_type pend = file.find('}', pstart);
     std::wstring key = file.substr(pstart+1, pend-2);
-    LOG_DEBUG_CORE(_T("Found key: ") + key);
+    //LOG_DEBUG_CORE(_T("Found key: ") + key);
 
     std::wstring tmp = file;

service/cli_parser.hpp

@@ -178 +178 @@
 
       po::options_description all("Allowed options");
-      all.add(root).add(common).add(service).add(settings).add(client);
+      all.add(root).add(common).add(service).add(settings).add(client).add(test).add(unittest);
       std::cout << all << std::endl;
 
@@ -204 +204 @@
 
   int parse_test(int argc, wchar_t* argv[]) {
-
-    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");
-
-    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)");
-      all.add(common).add(settings);
+    try {
+
+      po::options_description all("Allowed options (test)");
+      all.add(common).add(test);
 
       po::variables_map vm;
@@ -230 +213 @@
       po::notify(vm);
 
-      if (process_common_options("settings", all))
+      if (log_level.empty())
+        log_level  = _T("debug");
+
+      if (process_common_options("test", all))
         return 1;
+
+      if (vm.count("log-to-file") == 0) {
+        nsclient::logging::logger::set_backend("console");
+      }
 
       nsclient::simple_client client(core_);

service/logger_impl.cpp

@@ -269 +269 @@
 
   log_impl_type background_logger_;
+  bool running_;
 
 public:
 
-  threaded_logger(log_impl_type background_logger) : background_logger_(background_logger) {}
+  threaded_logger(log_impl_type background_logger) : background_logger_(background_logger), running_(false) {}
+  ~threaded_logger() {
+    shutdown();
+  }
 
   void do_log(const std::string &data) {
@@ -287 +291 @@
     std::string data;
     while (true) {
-      log_queue_.wait_and_pop(data);
-      if (data == QUIT_MESSAGE) {
-        break;
-      } else if (data == CONFIGURE_MESSAGE) {
-        if (background_logger_)
-          background_logger_->configure();
-      } else {
-        if (background_logger_)
-          background_logger_->do_log(data);
-        subscribers_.notify(data);
+      try {
+        log_queue_.wait_and_pop(data);
+        if (data == QUIT_MESSAGE) {
+          break;
+        } else if (data == CONFIGURE_MESSAGE) {
+          if (background_logger_)
+            background_logger_->configure();
+        } else {
+          if (background_logger_)
+            background_logger_->do_log(data);
+          subscribers_.notify(data);
+        }
+      } catch (const std::exception &e) {
+        log_fatal(std::string("Failed to process log message: ") + e.what());
+      } catch (...) {
+        log_fatal("Failed to process log message");
       }
     }
@@ -306 +316 @@
   bool startup() {
     thread_ = boost::thread(boost::bind(&threaded_logger::thread_proc, this));
+    running_ = true;
     return true;
   }
   bool shutdown() {
+    if (!running_)
+      return true;
     push(QUIT_MESSAGE);
     if (!thread_.timed_join(boost::posix_time::seconds(5))) {
@@ -314 +327 @@
       return false;
     }
+    running_ = false;
     return true;
   }
@@ -346 +360 @@
   }
   nsclient::logging::logging_interface_impl *old = logger_impl_ ;
-  logger_impl_  = tmp;
+  if (old != NULL && tmp != NULL) {
+    tmp->set_console_log(old->get_console_log());
+    tmp->set_log_level(old->get_log_level());
+  }
+  logger_impl_ = tmp;
   delete old;
   old = NULL;

version.hpp

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

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=156
-date=2012-04-05
+build=159
+date=2012-04-11