Changeset c91916f in nscp

Timestamp:

08/04/12 08:47:51 (10 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

24f6e3f

Parents:

ee230f7

Message:

• Fixed exception with "nscp service"
• Improved nscp settings so help is displayed.
• Improved nscp settings so default action (no arguments) also lists all installed services.
• Improved nscp settings to default list service nscp as well as legcy nsclientpp

Files:

• changelog (modified) (1 diff)
• service/cli_parser.hpp (modified) (2 diffs)
• service/logger_impl.hpp (modified) (1 diff)
• service/service_manager.hpp (modified) (2 diffs)

changelog

@@ -4 +4 @@
  * Fix dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-08-04 MickeM
+ * Fixed exception with "nscp service"
+ * Improved nscp settings so help is displayed.
+ * Improved nscp settings so default action (no arguments) also lists all installed services.
+ * Improved nscp settings to default list service nscp as well as legcy nsclientpp
 
 2012-08-03 MickeM

service/cli_parser.hpp

@@ -321 +321 @@
         name = vm["name"].as<std::wstring>();
       } else {
-        get_logger()->info(__FILE__, __LINE__, _T("TODO retrieve name from service here"));
+        name = nsclient::client::service_manager::get_default_service_name();
       }
       std::wstring desc;
@@ -351 +351 @@
         } else if (vm.count("stop")) {
           service_manager.stop();
-        } else if (vm.count("info")) {
-          service_manager.info();
         } else {
-          std::cerr << "Missing argument" << std::endl;
-          return 1;
+          if (vm.count("info") == 0) {
+            std::cerr << all << std::endl;
+            std::wcerr << _T("Invalid syntax: missing argument") << std::endl;
+          }
+          std::wcout << _T("Installed services: ") << std::endl;;
+          std::wcout << name << _T(": ") << service_manager.info() << std::endl;
+          {
+            nsclient::client::service_manager lsm(_T("nsclientpp"));
+            std::wstring cmd = lsm.info();
+            if (!cmd.empty()) {
+              std::wcout << _T("nsclientpp (legacy): ") << cmd << std::endl;
+            }
+
+          }
+          return vm.count("info");
         }
       }

service/logger_impl.hpp

@@ -32 +32 @@
           if (!lock.owns_lock())
             return;
+          if (subscribers_.empty())
+            return;
           BOOST_FOREACH(subscriber_type & s, subscribers_) {
             s->on_raw_log_message(data);

service/service_manager.hpp

@@ -80 +80 @@
         return 0;
       }
-      int info() {
+      std::wstring info() {
         try {
-          std::wstring exe = serviceControll::get_exe_path(service_name_);
-          print_error(_T("The Service uses: ") + exe);
+          return serviceControll::get_exe_path(service_name_);
         } catch (const serviceControll::SCException& e) {
           print_error(_T("Failed to find service: ") + e.error_);
-          return -1;
+          return _T("");
         }
-        return 0;
       }
     };
@@ -111 +109 @@
         return unsupported();
       }
-      int info() {
-        return unsupported();
+      std::wstring info() {
+        return _T("");
       }
     };