Changeset 231

Timestamp:

01/07/10 08:11:39 (2 years ago)

Author:

mickem

Message:

Removed "old" settings CLI toy since it is no longer used

Location:

trunk/service

Files:

• NSClient++.cpp (modified) (1 diff)
• NSClient++.h (modified) (1 diff)

trunk/service/NSClient++.cpp

@@ -523 +523 @@
 }
 
-void NSClientT::HandleSettingsCLI(wchar_t* arg, int argc, wchar_t* argv[]) {
-  std::wstring sarg = arg;
-  try {
-    if (sarg == _T("migrate")) {
-      if (argc == 0) {
-        LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings migrate <to>"));
-        return;
-      }
-      std::wstring to = argv[0];
-      LOG_DEBUG_STD(_T("Migrating to: ") + to);
-      try {
-        settings_manager::get_core()->migrate_to(Settings::SettingsCore::string_to_type(to));
-      } catch (SettingsException e) {
-        LOG_CRITICAL_STD(_T("Failed to migrate settings: ") + e.getError());
-      }
-    } else if (sarg == _T("generate")) {
-      if (argc == 0) {
-        LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings generate <what>"));
-        LOG_ERROR_CORE_STD(_T("     where <what> is one of ths following:"));
-        LOG_ERROR_CORE_STD(_T("      trac"));
-        LOG_ERROR_CORE_STD(_T("      default"));
-        LOG_ERROR_CORE_STD(_T("      <type>"));
-        return;
-      }
-      std::wstring arg1 = argv[0];
-      if (arg1 == _T("default")) {
-        try {
-          load_all_plugins(NSCAPI::dontStart);
-          settings_manager::get_core()->update_defaults();
-          settings_manager::get_core()->get()->save();
-        } catch (SettingsException e) {
-          LOG_CRITICAL_STD(_T("Failed to migrate settings: ") + e.getError());
-        }
-      } else if (arg1 == _T("trac")) {
-        try {
-          load_all_plugins(NSCAPI::dontStart);
-
-          Settings::string_list s = settings_manager::get_core()->get_reg_sections();
-          for (Settings::string_list::const_iterator cit = s.begin(); cit != s.end(); ++cit) {
-            std::wcout << _T("== ") << (*cit) << _T(" ==") << std::endl;
-            Settings::string_list k = settings_manager::get_core()->get_reg_keys(*cit);
-            bool first = true;
-            for (Settings::string_list::const_iterator citk = k.begin(); citk != k.end(); ++citk) {
-              Settings::SettingsCore::key_description desc = settings_manager::get_core()->get_registred_key(*cit, *citk);
-              if (!desc.advanced) {
-                if (first)
-                  std::wcout << _T("'''Normal settings'''") << std::endl;
-                first = false;
-                std::wcout << _T("||") << (*citk) << _T("||") << desc.defValue << _T("||") << desc.title << _T(": ") << desc.description
-                  << std::endl;
-              }
-            }
-            first = true;
-            for (Settings::string_list::const_iterator citk = k.begin(); citk != k.end(); ++citk) {
-              Settings::SettingsCore::key_description desc = settings_manager::get_core()->get_registred_key(*cit, *citk);
-              if (desc.advanced) {
-                if (first)
-                  std::wcout << _T("'''Advanced settings'''") << std::endl;
-                first = false;
-                std::wcout << _T("||") << (*citk) << _T("||") << desc.defValue << _T("||") << desc.title << _T(": ") << desc.description
-                  << std::endl;
-              }
-            }
-          }
-        } catch (SettingsException e) {
-          LOG_CRITICAL_STD(_T("Failed to migrate settings: ") + e.getError());
-        }
-      } else {
-        try {
-          Settings::SettingsCore::settings_type type = settings_manager::get_core()->string_to_type(arg1);
-          load_all_plugins(NSCAPI::dontStart);
-          settings_manager::get_core()->update_defaults();
-          settings_manager::get_core()->get(type)->save();
-        } catch (SettingsException e) {
-          LOG_CRITICAL_STD(_T("Failed to migrate settings: ") + e.getError());
-        }
-      }
-    } else {
-      LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings <keyword>"));
-      LOG_ERROR_CORE_STD(_T(" <keyword> : "));
-      LOG_ERROR_CORE_STD(_T("   migrate - migrate to a new setings subsystem"));
-      LOG_ERROR_CORE_STD(_T("   copy    - copy settings from one subsystem to another"));
-      LOG_ERROR_CORE_STD(_T("   set     - Set a setting system as the default store"));
-    }
-
-
-  } catch (SettingsException e) {
-    LOG_CRITICAL_STD(_T("Failed to initialize settings: ") + e.getError());
-  } catch (...) {
-    LOG_CRITICAL(_T("FATAL ERROR IN SETTINGS SUBSYTEM"));
-  }
-
-}
-
 void NSClientT::session_error(std::wstring file, unsigned int line, std::wstring msg) {
   NSAPIMessage(NSCAPI::error, file.c_str(), line, msg.c_str());

trunk/service/NSClient++.h

@@ -178 +178 @@
   void registerCommand(unsigned int id, std::wstring cmd, std::wstring desc);
   unsigned int getBufferLength();
-  void HandleSettingsCLI(wchar_t* arg, int argc, wchar_t* argv[]);
   void startTrayIcons();
   void startTrayIcon(DWORD dwSessionId);