Changeset 96c1461 in nscp for service/plugin_list.hpp

Timestamp:

11/27/11 22:04:35 (18 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

9853bc3

Parents:

16198e3

Message:

• Major refactoring in the command line interface
• Added support for alias to many common module (command line) so: nscp eventlog (is the same as nscp client --module CheckEventLog)
• Fixed issue with CheckEventLog message rendering and eventid
• Refactored all Client modules to all support command line, commands and submissions.
• Added uniform handling of "everything" to all Client plugins
• Fixed SyslogClient to work "as advertised" (ie. all hardcoded stuff is removed)
• Fixed utf8 issue with text strings (now have a working concept which needs to be implementd "all over the place")
• Many issues and fixes related to clients.
• Fixed so CheckEvent? log (insert) works much better (added new options)

File:

• service/plugin_list.hpp (modified) (3 diffs)

service/plugin_list.hpp

@@ -101 +101 @@
     std::wstring to_wstring() {
       std::wstring ret;
-      BOOST_FOREACH(std::wstring str, list()) {
+      std::list<std::wstring> lst = list();
+      BOOST_FOREACH(std::wstring str, lst) {
         if (!ret.empty()) ret += _T(", ");
         ret += str;
@@ -109 +110 @@
     std::string to_string() {
       std::string ret;
-      BOOST_FOREACH(std::wstring str, list()) {
+      std::list<std::wstring> lst = list();
+      BOOST_FOREACH(std::wstring str, lst) {
         if (!ret.empty()) ret += ", ";
         ret += utf8::cvt<std::string>(str);
       }
-      return ret + parent::to_string();
+      return "plugins: {" + ret + "}, " + parent::to_string();
     }
 
@@ -189 +191 @@
       std::wstring lc = make_key(channel);
       if (!have_plugin(plugin_id)) {
-        writeLock.release();
+        writeLock.unlock();
         throw plugins_list_exception("Failed to find plugin: " + ::to_string(plugin_id) + ", Plugins: " + to_string());
       }