Changeset b4db89d in nscp

Timestamp:

08/22/10 10:12:56 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

c146f89

Parents:

57a86f3

Message:

*sigh* maybe time to find a propepr dev enviornment for *nix?

Files:

• include/settings/settings_ini.hpp (modified) (5 diffs)
• service/NSClient++.cpp (modified) (2 diffs)

include/settings/settings_ini.hpp

@@ -15 +15 @@
   class INISettings : public settings::SettingsInterfaceImpl {
   private:
-    boost::filesystem::wpath filename_;
+    std::wstring filename_;
     bool is_loaded_;
     CSimpleIni ini;
@@ -209 +209 @@
     virtual void save() {
       SettingsInterfaceImpl::save();
-      SI_Error rc = ini.SaveFile(get_file_name().string().c_str());
+      SI_Error rc = ini.SaveFile(get_file_name().c_str());
       if (rc < 0)
         throw_SI_error(rc, _T("Failed to save file"));
@@ -225 +225 @@
         return;
       }
-      std::wstring f = get_file_name().string();
+      std::wstring f = get_file_name();
       get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Loading: ") + f + _T(" from ") + get_context());
       SI_Error rc = ini.LoadFile(f.c_str());
@@ -248 +248 @@
       throw settings_exception(msg + _T(": ") + get_context() + _T(" - ") + error_str);
     }
-    boost::filesystem::wpath get_file_name() {
+    std::wstring get_file_name() {
       if (filename_.empty()) {
         filename_ = get_file_from_context();
         //filename_ = get_core()->get_base() / boost::filesystem::wpath(get_core()->get_boot_string(get_context(), _T("file"), _T("nsclient.ini")));
-        get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Reading INI settings from: ") + filename_.string());
+        get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Reading INI settings from: ") + filename_);
       }
       return filename_;
@@ -260 +260 @@
     }
     virtual std::wstring get_info() {
-      return _T("INI settings: (") + context_ + _T(", ") + get_file_name().string() + _T(")");
+      return _T("INI settings: (") + context_ + _T(", ") + get_file_name() + _T(")");
     }
 

service/NSClient++.cpp

@@ -517 +517 @@
 
 void NSClientT::load_all_plugins(int mode) {
-  boost::filesystem::wpath pluginPath = expand_path(_T("${module-path}"));
+  boost::filesystem::wpath pluginPath;
+  try {
+    pluginPath = expand_path(_T("${module-path}"));
+  } catch (std::exception &e) {
+    LOG_CRITICAL_STD(_T("Failed to load plugins: ") + to_wstring(e.what()) + _T(" for ") + expand_path(_T("${module-path}")));
+    return;
+  }
   plugin_alias_list_type plugins = find_all_plugins(false);
   std::pair<std::wstring,std::wstring> v;
@@ -1376 +1382 @@
   strEx::replace(file, _T("${shared-path}"), getBasePath().string());
 #else
-  strEx::replace(file, _T("${shared-path}"), _T("/usr/share/nsclient++"));
+  strEx::replace(file, _T("${shared-path}"), getBasePath().string());
+//  strEx::replace(file, _T("${shared-path}"), _T("/usr/share/nsclient++"));
 #endif
   strEx::replace(file, _T("${exe-path}"), getBasePath().string());