Changeset 569a179 in nscp

Timestamp:

03/09/11 21:21:25 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

7443b58

Parents:

7e54a5f

Message:

0.4.x: fixed some more old settings mappings and handling

Files:

• files/old-settings.map (modified) (2 diffs)
• include/settings/settings_old.hpp (modified) (4 diffs)

files/old-settings.map

@@ -27 +27 @@
 Settings/obfuscated_password=/settings/default/obfuscated password
 Settings/password=/settings/default/password
-Settings/allowed_hosts=/settings/allowed hosts
+Settings/allowed_hosts=/settings/default/allowed hosts
 Settings/shared_session=/settings/shared session/enabled
 
@@ -52 +52 @@
 # NRPE/script_dir
 
-Check System/CPUBufferSize=/settings/CheckSystem/CPUBufferSize
-Check System/CheckResolution=/settings/CheckSystem/CheckResolution
-#Check System/check_all_services[SERVICE_BOOT_START]
-#Check System/check_all_services[SERVICE_SYSTEM_START]
-#Check System/check_all_services[SERVICE_AUTO_START]
-#Check System/check_all_services[SERVICE_DEMAND_START]
-#Check System/check_all_services[SERVICE_DISABLED]
+#Check System/CPUBufferSize=/settings/check/system/windows/CPUBufferSize
+#Check System/CheckResolution=/settings/CheckSystem/CheckResolution
+Check System/check_all_services[SERVICE_BOOT_START]=/settings/check/system/windows/service mapping/SERVICE_BOOT_START
+Check System/check_all_services[SERVICE_SYSTEM_START]=/settings/check/system/windows/service mapping/SERVICE_SYSTEM_START
+Check System/check_all_services[SERVICE_AUTO_START]=/settings/check/system/windows/service mapping/SERVICE_AUTO_START
+Check System/check_all_services[SERVICE_DEMAND_START]=/settings/check/system/windows/service mapping/SERVICE_DEMAND_START
+Check System/check_all_services[SERVICE_DISABLED]=/settings/check/system/windows/service mapping/SERVICE_DISABLED
 
-External Script/command_timeout=/settings/External Scripts/command timeout
-External Script/allow_arguments=/settings/External Scripts/allow arguments
-External Script/allow_nasty_meta_chars=/settings/External Scripts/allow_nasty_meta_chars
-External Script/script_dir=/settings/External Scripts/script folder
+External Script/command_timeout=/settings/external scripts/command timeout
+External Script/allow_arguments=/settings/external scripts/allow arguments
+External Script/allow_nasty_meta_chars=/settings/external scripts/allow_nasty_meta_chars
+External Script/script_dir=/settings/external scripts/script folder
 
-#Script Wrappings/vbs=
-#Script Wrappings/ps1=
-#Script Wrappings/bat=
-
+Script Wrappings/*=/settings/external scripts/wrappings
 External Scripts/*=/settings/external scripts/scripts
-
-External Alias/*=/settings/External Alias/command
-
-#Wrapped Scripts/*=
+External Alias/*=/settings/external scripts/alias
+Wrapped Scripts/*=/settings/external scripts/wrapped scripts
 
 includes/*=/include/*

include/settings/settings_old.hpp

@@ -60 +60 @@
       std::pair<std::wstring,std::wstring> new_key = split_key(line.substr(pos+1));
       if (old_key.second == _T("*") || old_key.second.empty()) {
-        add_mapping(new_key.first, old_key.first);
-        get_logger()->debug(__FILE__, __LINE__, _T("Adding: ") + old_key.first + _T(" >> ") + new_key.first);
+        add_mapping(line.substr(pos+1), old_key.first);
       } else {
         add_mapping(new_key.first, new_key.second, old_key.first, old_key.second);
-        get_logger()->debug(__FILE__, __LINE__, _T("Adding: ") + old_key.first + _T(":") + old_key.second + _T(" >> ") + new_key.first + _T(":") + new_key.second);
       }
 
@@ -84 +82 @@
     key_map keys_;
     void add_mapping(std::wstring path_new, std::wstring path_old) {
+      get_core()->get_logger()->debug(__FILE__, __LINE__, _T("Mapping: ") + path_new + _T(" to ") + path_old);
       sections_[path_new] = path_old;
     }
@@ -95 +94 @@
       if (it == sections_.end())
         return path_new;
-      //get_core()->get_logger()->debug(__FILE__, __LINE__, _T("Mapping: ") + path_new + _T(" to ") + (*it).second);
       return (*it).second;
     }
@@ -345 +343 @@
           get_core()->get_logger()->debug(__FILE__, __LINE__, std::wstring(_T("=============>>>>>>>>>>>")) + key.first + _T(" >>>> ") + key.second);
           if (it == section_cache_.end()) {
-            std::set<std::wstring> list = internal_read_keys_from_section(path);
+            std::set<std::wstring> list = internal_read_keys_from_section(key.second);
             section_cache_[path] = list;
             it = section_cache_.find(path);