Changeset f898ded in nscp

Timestamp:

08/01/12 23:52:25 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

b611d99

Parents:

7263789

Message:

• Added so running "nscp settings" will list all loaded settins context (as a tree). Quick way to see where your settings are stored.

Files:

• changelog (modified) (1 diff)
• include/settings/impl/settings_http.hpp (modified) (1 diff)
• include/settings/settings_core.hpp (modified) (1 diff)
• include/settings/settings_interface_impl.hpp (modified) (1 diff)
• service/cli_parser.hpp (modified) (1 diff)
• service/settings_client.hpp (modified) (1 diff)

changelog

@@ -7 +7 @@
 2012-08-01 MickeM
  * Resolved issue with crypto++ on linux (introduced by buildspeedups)
+ * Added so running "nscp settings" will list all loaded settins context (as a tree).
+   Quick way to see where your settings are stored.
 
 2012-07-31 MickeM

include/settings/impl/settings_http.hpp

@@ -42 +42 @@
       if (!http::client::download(url.protocol, url.host, url.path, os, error)) {
         os.close();
-        get_logger()->error(__FILE__, __LINE__, _T("Failed to download settings: ") + utf8::cvt<std::wstring>(error));
+        get_logger()->error(__FILE__, __LINE__, _T("Failed to download settings: ") + utf8::to_unicode(error));
       }
       os.close();

include/settings/settings_core.hpp

@@ -477 +477 @@
     }
 
-
+    virtual std::list<boost::shared_ptr<settings_interface> > get_children() = 0;
   };
 

include/settings/settings_interface_impl.hpp

@@ -130 +130 @@
       return core_;
     }
-    const nsclient::logging::logger_interface* get_logger() const {
+    nsclient::logging::logger_interface* get_logger() const {
       return nsclient::logging::logger::get_logger();
     }
 
     void add_child(std::wstring context) {
-      MUTEX_GUARD();
-      children_.push_back(get_core()->create_instance(context));
+      try {
+        instance_raw_ptr child = get_core()->create_instance(context);
+        {
+          MUTEX_GUARD();
+          children_.push_back(child);
+        }
+      } catch (const std::exception &e) {
+        get_logger()->error(__FILE__, __LINE__, _T("Failed to load child: ") + utf8::to_unicode(e.what()));
+      }
+    }
+
+    virtual std::list<boost::shared_ptr<settings_interface> > get_children() {
+      return children_;
     }
 

service/cli_parser.hpp

@@ -271 +271 @@
       } else {
         std::cout << all << std::endl;
+        client.list_settings_info();
         return 1;
       }

service/settings_client.hpp

@@ -197 +197 @@
       nsclient::logging::logger::get_logger()->debug(__FILE__, __LINE__, msg.c_str());
     }
+
+    void list_settings_context_info(int padding, settings::instance_ptr instance) {
+      std::wstring pad = std::wstring(padding, L' ');
+      std::wcout << pad << instance->get_info() << std::endl;
+      BOOST_FOREACH(settings::instance_ptr child, instance->get_children()) {
+        list_settings_context_info(padding+2, child);
+      }
+    }
+    void list_settings_info() {
+      std::wcout << _T("Current settings instance loaded: ") << std::endl;
+      list_settings_context_info(2, settings_manager::get_settings());
+    }
   };
 }