From ce86331f1e7dc72f29e048d4e752cbee21e7db9d Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Mon, 29 Aug 2016 16:09:30 -0400
Subject: [PATCH] Clean up the new sysadm/services class just a bit more.
 Getting ready to add all the start/stop/restart API calls.

---
 src/server/WebBackend.cpp                    |  5 ++++-
 src/server/library/sysadm-servicemanager.cpp | 12 ++++++------
 src/server/library/sysadm-servicemanager.h   |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 9ae2e91..f6154ae 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -1020,6 +1020,9 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmServiceRequest(const QJsonVa
     ok = true;
     out->insert("services",services);
   }
-
+  if(out->keys().isEmpty()){
+    if(ok){ out->insert("result","success"); }
+    else{ out->insert("error","error");
+  }
   return (ok ? RestOutputStruct::OK : RestOutputStruct::BADREQUEST);
 }
diff --git a/src/server/library/sysadm-servicemanager.cpp b/src/server/library/sysadm-servicemanager.cpp
index d415f68..13625da 100644
--- a/src/server/library/sysadm-servicemanager.cpp
+++ b/src/server/library/sysadm-servicemanager.cpp
@@ -65,7 +65,7 @@ bool ServiceManager::isEnabled(Service service){ //single-item overload
   else{ return false; }
 }
 
-void ServiceManager::Start(Service service)
+bool ServiceManager::Start(Service service)
 {
     // Start the process
     QString prog;
@@ -79,10 +79,10 @@ void ServiceManager::Start(Service service)
       prog = "warden";
       args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("start");
     }
-    General::RunCommand(prog,args);
+    return General::RunQuickCommand(prog,args);
 }
 
-void ServiceManager::Stop(Service service)
+bool ServiceManager::Stop(Service service)
 {
     // Start the process
     QString prog;
@@ -96,10 +96,10 @@ void ServiceManager::Stop(Service service)
       prog = "warden";
       args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("stop");
     }
-    General::RunCommand(prog,args);
+    return General::RunQuickCommand(prog,args);
 }
 
-void ServiceManager::Restart(Service service)
+bool ServiceManager::Restart(Service service)
 {
     QString prog;
     QStringList args;
@@ -112,7 +112,7 @@ void ServiceManager::Restart(Service service)
       prog = "warden";
       args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("restart");
     }
-    General::RunCommand(prog,args);
+    return General::RunQuickCommand(prog,args);
 }
 
 void ServiceManager::Enable(Service service)
diff --git a/src/server/library/sysadm-servicemanager.h b/src/server/library/sysadm-servicemanager.h
index 1f25e7c..bb2a4a4 100644
--- a/src/server/library/sysadm-servicemanager.h
+++ b/src/server/library/sysadm-servicemanager.h
@@ -53,17 +53,17 @@ public:
      * @brief Start starts a service
      * @param service the service to start
      */
-    void Start(Service service);
+    bool Start(Service service);
     /**
      * @brief Stop stops a service
      * @param service the service to stop
      */
-    void Stop(Service service);
+    bool Stop(Service service);
     /**
      * @brief Restart restarts a service
      * @param service the service to restart
      */
-    void Restart(Service service);
+    bool Restart(Service service);
 
     /**
      * @brief Enable enable a service