Changeset 285

Timestamp:

08/22/10 09:51:17 (18 months ago)

Author:

mickem

Message:

Various settings loading fixes

Location:

trunk

Files:

• include/settings/settings_ini.hpp (modified) (1 diff)
• include/settings/settings_interface_impl.hpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (1 diff)
• service/settings_manager_impl.cpp (modified) (1 diff)

trunk/include/settings/settings_ini.hpp

@@ -225 +225 @@
         return;
       }
-      SI_Error rc = ini.LoadFile(get_file_name().string().c_str());
+      std::wstring f = get_file_name().string();
+      get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Loading: ") + f);
+      SI_Error rc = ini.LoadFile(f.c_str());
       if (rc < 0)
         throw_SI_error(rc, _T("Failed to load file"));

trunk/include/settings/settings_interface_impl.hpp

@@ -492 +492 @@
     }
     virtual std::wstring get_file_from_context() {
-      return core_->find_file(url_.host + url_.path, DEFAULT_CONF_OLD_LOCATION);
+      return core_->find_file(url_.host + url_.path, _T(""));
     }
     //////////////////////////////////////////////////////////////////////////

trunk/service/NSClient++.cpp

@@ -1376 +1376 @@
   strEx::replace(file, _T("${shared-path}"), getBasePath().string());
 #else
-  strEx::replace(file, _T("${shared-path}"), _T("/usr/shared/nsclient++"));
+  strEx::replace(file, _T("${shared-path}"), _T("/usr/share/nsclient++"));
 #endif
   strEx::replace(file, _T("${exe-path}"), getBasePath().string());

trunk/service/settings_manager_impl.cpp

@@ -44 +44 @@
   settings::instance_raw_ptr NSCSettingsImpl::create_instance(std::wstring key) {
     net::url url = net::parse(key);
+    if (url.host.empty() && url.path.empty()) 
+      key = _T("");
 #ifdef WIN32
     if (url.protocol == _T("old")) {
       old_ = true;
+      if (key.empty())
+        key = DEFAULT_CONF_OLD_LOCATION;
       return settings::instance_raw_ptr(new settings::OLDSettings(this, key));
-    } 
-    if (url.protocol == _T("registry"))
+    }
+    if (url.protocol == _T("registry")) {
+      if (key.empty())
+        key = DEFAULT_CONF_REG_LOCATION;
       return settings::instance_raw_ptr(new settings::REGSettings(this, key));
+    }
 #endif
-    if (url.protocol == _T("ini"))
+    if (url.protocol == _T("ini")) {
+      if (key.empty())
+        key = DEFAULT_CONF_INI_LOCATION;
       return settings::instance_raw_ptr(new settings::INISettings(this, key));
+    }
     throw settings::settings_exception(_T("Undefined settings protocol: ") + url.protocol);
   }