Changeset c74d7b6 in nscp

Timestamp:

02/21/12 23:29:34 (16 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

84cdb9b

Parents:

72eea1f

Message:

• Added new module CauseCrash? which has a single command CrashClient? to allow the service to be crashed remotly *WARNING* Dont use this command, it is for debugging and testing purpouses only
• Fixed issue with BreakPad? which was disabled
• Fixed some unix issues (sorry but hudson's stopped emailing me again:( )
• Fixed service --install (now sets correct options)
• Fixed service --install (now sets description correctly)
• Fixed log level defined in protobuf (now same as rest of the system)
• Fixed some issues with the check_nscp command

Files:

• changelog (modified) (1 diff)
• include/ServiceCmd.cpp (modified) (1 diff)
• include/net/net.hpp (modified) (1 diff)
• include/nscapi/settings_object.hpp (modified) (8 diffs)
• libs/protobuf/plugin.proto (modified) (1 diff)
• modules/CauseCrashes/CMakeLists.txt (added)
• modules/CauseCrashes/CauseCrashes.cpp (added)
• modules/CauseCrashes/CauseCrashes.def (added)
• modules/CauseCrashes/CauseCrashes.h (added)
• modules/CauseCrashes/module.cmake (added)
• modules/CauseCrashes/stdafx.cpp (added)
• modules/CauseCrashes/stdafx.h (added)
• modules/CheckNSCP/CheckNSCP.cpp (modified) (2 diffs)
• modules/NSCAClient/NSCAClient.cpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (1 diff)
• service/cli_parser.hpp (modified) (1 diff)
• service/service_manager.hpp (modified) (2 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -5 +5 @@
  * Fix RtlStringFromGUID problem on NT4
 
-2012-02-19 MickeM
+2012-02-21 MickeM
+ * Added new module CauseCrash which has a single command CrashClient to allow the service to be crashed remotly
+   *WARNING* Dont use this command, it is for debugging and testing purpouses only
+ * Fixed issue with BreakPad which was disabled
+ * Fixed some unix issues (sorry but hudson's stopped emailing me again:( )
+ * Fixed service --install (now sets correct options)
+ * Fixed service --install (now sets description correctly)
+ * Fixed log level defined in protobuf (now same as rest of the system)
+ * Fixed some issues with the check_nscp command
+
+2012-02-20 MickeM
  * Fixed NRPE buffer issue
  * Added test case for 65K NRPE buffer length as well as 1Mb 

include/ServiceCmd.cpp

@@ -394 +394 @@
 
     TCHAR* d = new TCHAR[desc.length()+2];
-    wcsncpy(d, desc.c_str(), desc.length());
+    wcsncpy(d, desc.c_str(), desc.length()+1);
     descr.lpDescription = d;
     BOOL bResult = FChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &descr);

include/net/net.hpp

@@ -93 +93 @@
   };
 
-  typedef public base_url<std::string, std::stringstream, string_traits> url;
-  typedef public base_url<std::wstring, std::wstringstream, wstring_traits> wurl;
+  typedef base_url<std::string, std::stringstream, string_traits> url;
+  typedef base_url<std::wstring, std::wstringstream, wstring_traits> wurl;
 
   inline wurl url_to_wide(const url &u) {

include/nscapi/settings_object.hpp

@@ -36 +36 @@
 
 
-    template<class object_type = default_object_type, class object_reader = default_object_reader<default_object_type> >
+    template<class t_object_type, class object_reader>
     struct object_handler : boost::noncopyable {
-      typedef boost::optional<object_type> optional_object;
-      typedef std::map<std::wstring, object_type> object_list_type;
-      typedef object_handler<object_type, object_reader> my_type;
+      typedef boost::optional<t_object_type> optional_object;
+      typedef std::map<std::wstring, t_object_type> object_list_type;
+      typedef object_handler<t_object_type, object_reader> my_type;
 
       object_list_type object_list;
@@ -51 +51 @@
       }
 
-      object_type add(boost::shared_ptr<nscapi::settings_proxy> proxy, std::wstring path, std::wstring alias, std::wstring value, bool is_template = false) {
-        object_type object;
+      t_object_type add(boost::shared_ptr<nscapi::settings_proxy> proxy, std::wstring path, std::wstring alias, std::wstring value, bool is_template = false) {
+        t_object_type object;
         object.alias = alias;
         object.value = value;
@@ -62 +62 @@
 
         if (!object.parent.empty() && object.parent != alias & object.parent != object.alias) {
-          object_type parent;
+          t_object_type parent;
           optional_object tmp = find_object(object.parent);
           if (!tmp) {
@@ -80 +80 @@
 
       void rebuild(boost::shared_ptr<nscapi::settings_proxy> proxy) {
-        std::list<object_type> tmp;
-        BOOST_FOREACH(object_list_type::value_type t, object_list) {
+        std::list<t_object_type> tmp;
+        BOOST_FOREACH(const typename object_list_type::value_type &t, object_list) {
           tmp.push_back(t.second);
         }
         object_list.clear();
-        BOOST_FOREACH(const &object_item o, tmp) {
+        BOOST_FOREACH(const t_object_type &o, tmp) {
           std::wstring::size_type pos = o.path.find_last_of(_T("/"));
           if (pos == std::wstring::npos)
@@ -95 +95 @@
 
       optional_object find_object(std::wstring alias) {
-        object_list_type::const_iterator cit = object_list.find(alias);
+        typename object_list_type::const_iterator cit = object_list.find(alias);
         if (cit != object_list.end())
           return optional_object(cit->second);
@@ -105 +105 @@
 
       bool has_object(std::wstring alias) {
-        object_list_type::const_iterator cit = object_list.find(alias);
+        typename object_list_type::const_iterator cit = object_list.find(alias);
         if (cit != object_list.end())
           return true;
@@ -118 +118 @@
         std::wstringstream ss;
         ss << _T("Objects: ");
-        BOOST_FOREACH(object_list_type::value_type t, object_list) {
+        BOOST_FOREACH(const typename object_list_type::value_type &t, object_list) {
           ss << _T(", ") << t.first << _T(" = {") << t.second.to_wstring() + _T("} ");
         }
         ss << _T("Templates: ");
-        BOOST_FOREACH(object_list_type::value_type t, template_list) {
+        BOOST_FOREACH(const typename object_list_type::value_type &t, template_list) {
           ss << _T(", ") << t.first << _T(" = {") << t.second.to_wstring() + _T("} ");
         }
@@ -128 +128 @@
       }
 
-      void add_object(object_type object) {
+      void add_object(t_object_type object) {
         object_reader::post_process_object(object);
-        object_list_type::iterator cit = template_list.find(object.alias);
+        typename object_list_type::iterator cit = template_list.find(object.alias);
         if (cit != template_list.end())
           template_list.erase(cit);
         object_list[object.alias] = object;
       }
-      void add_template(object_type object) {
-        object_list_type::const_iterator cit = object_list.find(object.alias);
+      void add_template(t_object_type object) {
+        typename object_list_type::const_iterator cit = object_list.find(object.alias);
         if (cit != object_list.end())
           return;

libs/protobuf/plugin.proto

@@ -312 +312 @@
   message Entry {
     enum Level {
-      LOG_DEBUG =  0;
-      LOG_INFO  = 10;
-      LOG_WARNING = 20;
-      LOG_ERROR = 30;
-      LOG_CRITICAL  = 40;
+      LOG_DEBUG = 500;
+      LOG_INFO  = 150;
+      LOG_WARNING =  50;
+      LOG_ERROR =  10;
+      LOG_CRITICAL  =   1;
     };
     required Level  level = 1;

modules/CheckNSCP/CheckNSCP.cpp

@@ -43 +43 @@
 
     settings.alias().add_key_to_settings()
-      (_T("archive folder"), sh::wstring_key(&crashFolder, CRASH_ARCHIVE_FOLDER),
+      (_T("archive folder"), sh::wpath_key(&crashFolder, CRASH_ARCHIVE_FOLDER),
       CRASH_ARCHIVE_FOLDER_KEY, _T("The archive folder for crash dunpes."))
       ;
@@ -90 +90 @@
 int CheckNSCP::get_crashes(std::wstring &last_crash) {
 #ifdef WIN32
+  NSC_DEBUG_MSG(_T("Crash folder is: ") + crashFolder);
   if (!file_helpers::checks::is_directory(crashFolder)) {
     return 0;

modules/NSCAClient/NSCAClient.cpp

@@ -116 +116 @@
           iter++;
         }
-      } catch (exception& e) {
-        cerr << "Error: " << e.what() << endl;
+      } catch (const std::exception& e) {
+        NSC_LOG_ERROR_STD(_T("Failed to resolve: ") + utf8::to_unicode(e.what()));
       }
 

service/NSClient++.cpp

@@ -632 +632 @@
       LOG_ERROR_CORE(_T("No crash handling configured"));
     } else {
-      //g_exception_manager->StartMonitoring();
+      g_exception_manager->StartMonitoring();
     }
   }

service/cli_parser.hpp

@@ -331 +331 @@
       return 0;
     } catch(std::exception & e) {
-      mainClient.log_error(__FILE__, __LINE__, std::string("Unable to parse command line (settings): ") + e.what());
+      std::cerr << std::string("Unable to parse command line (settings): ") << e.what() << "\n";
       return 1;
     }

service/service_manager.hpp

@@ -26 +26 @@
       }
       static std::wstring get_default_arguments() {
-        return _T("--service --run");
+        return _T("service --run");
       }
       inline void print_msg(std::wstring str) {
@@ -42 +42 @@
           serviceControll::Install(service_name_, service_description, get_default_service_deps(), SERVICE_WIN32_OWN_PROCESS, args);
         } catch (const serviceControll::SCException& e) {
-          print_error(_T("Service installation failed: ") + e.error_);
+          print_error(_T("Service installation failed of '") + service_name_ + _T("' failed: ") + e.error_);
           return -1;
         }

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,136
-#define STRPRODUCTVER  "0,4,0,136"
+#define PRODUCTVER     0,4,0,137
+#define STRPRODUCTVER  "0,4,0,137"
 #define STRPRODUCTDATE "2012-02-20"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=136
+build=137
 date=2012-02-20