From 0d4eb2c4f3b19980ea0ef0d9a7b2d008a72b1f81 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Mon, 29 Aug 2016 14:59:32 -0400
Subject: [PATCH] Cleanup the rc.conf parsing a bit more - turn of debugging
 messages, and ensure we use [one][start/stop/restart] as needed depending on
 if it is enabled or not.

---
 src/server/library/sysadm-servicemanager.cpp | 88 ++++++++++----------
 src/server/library/sysadm-servicemanager.h   |  5 ++
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/server/library/sysadm-servicemanager.cpp b/src/server/library/sysadm-servicemanager.cpp
index e5500b4..d415f68 100644
--- a/src/server/library/sysadm-servicemanager.cpp
+++ b/src/server/library/sysadm-servicemanager.cpp
@@ -49,44 +49,11 @@ bool ServiceManager::isRunning(Service service){ //single-item overload
 QList<bool> ServiceManager::isEnabled(QList<Service> services){
    //return list in the same order as the input list
   QList<bool> out;
-  //Read all the rc.conf files in highest-priority order
-  QHash<QString, QString> data;
-  QDir dir("/etc");
-  QStringList confs = dir.entryList(QStringList() << "rc.conf*", QDir::Files, QDir::Name | QDir::Reversed);
-  qDebug() << "Conf file order:" << confs;
-  for(int i=0; i<confs.length(); i++){
-    QFile file(dir.absoluteFilePath(confs[i]));
-    if( file.open(QIODevice::ReadOnly) ){
-      qDebug() << "Read File:" << confs[i];
-      bool insection = true;
-      QTextStream stream(&file);
-      while(!stream.atEnd()){
-        QString info = stream.readLine();
-        //qDebug() << "Read Line:" << info;
-        if(info.contains("=") && insection){
-          data.insert(info.section("=",0,0).simplified(), info.section("=",1,-1));
-          qDebug() << "Got data entry:" << info;
-        }else if(info.simplified()=="fi"){ 
-          insection= true;
-        }else if(info.simplified().startsWith("if [ ") ){
-          QStringList args = info.section("]",0,0).section("[",1,-1).split("\""); //odd numbers are files, even are arguments
-          for(int j=0; j<args.length()-1; j+=2){
-            qDebug() << "Check if arguments:" << args[j] << args[j+1] << insection;
-            if(!args[j].contains("-e")){ insection = false; break; } //don't know how to handle this - skip section
-            if(args[j].contains("-o")){ insection == insection || QFile::exists(args[j+1]); }
-            else if(args[j].contains("-a")){ insection == insection && QFile::exists(args[j+1]); }
-            else{ insection = QFile::exists(args[j+1]); } //typically the first argument check
-            qDebug() << " - Now:" << insection;
-          } //end loop over existance arguments
-        }
-      }//end loop over lines
-      file.close();
-    }
-  }
+  loadRCdata();  
   //Now go through the list of services and report which ones are enabled
   for(int i=0; i<services.length(); i++){
     bool enabled = false;
-    if(data.contains(services[i].Tag)){ enabled = data.value(services[i].Tag)=="\"YES\""; }
+    if(rcdata.contains(services[i].Tag)){ enabled = rcdata.value(services[i].Tag)=="\"YES\""; }
     out << enabled;
   }
   return out;
@@ -103,14 +70,14 @@ void ServiceManager::Start(Service service)
     // Start the process
     QString prog;
     QStringList args;
-
+    bool once = !isEnabled(service);
     if ( chroot.isEmpty() ) {
       prog = "service";
       args << service.Directory;
       args << "start";
     } else {
       prog = "warden";
-      args << "chroot" << ip << "service" << service.Directory << "start";
+      args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("start");
     }
     General::RunCommand(prog,args);
 }
@@ -120,14 +87,14 @@ void ServiceManager::Stop(Service service)
     // Start the process
     QString prog;
     QStringList args;
-
+    bool once = !isEnabled(service);
     if ( chroot.isEmpty() ) {
       prog = "service";
       args << service.Directory;
       args << "stop";
     } else {
       prog = "warden";
-      args << "chroot" << ip << "service" << service.Directory << "stop";
+      args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("stop");
     }
     General::RunCommand(prog,args);
 }
@@ -136,14 +103,14 @@ void ServiceManager::Restart(Service service)
 {
     QString prog;
     QStringList args;
-
+    bool once = !isEnabled(service);
     if ( chroot.isEmpty() ) {
       prog = "service";
       args << service.Directory;
-      args << "restart";
+      args <<(once ? "one" : "" )+ QString("restart");
     } else {
       prog = "warden";
-      args << "chroot" << ip << "service" << service.Directory << "restart";
+      args << "chroot" << ip << "service" << service.Directory << (once ? "one" : "" )+QString("restart");
     }
     General::RunCommand(prog,args);
 }
@@ -251,3 +218,40 @@ Service ServiceManager::loadServices(QString name)
     }
   return Service();
 }
+
+void ServiceManager::loadRCdata(){
+  //Read all the rc.conf files in highest-priority order
+  rcdata.clear();
+  QDir dir("/etc");
+  QStringList confs = dir.entryList(QStringList() << "rc.conf*", QDir::Files, QDir::Name | QDir::Reversed);
+  //qDebug() << "Conf file order:" << confs;
+  for(int i=0; i<confs.length(); i++){
+    QFile file(dir.absoluteFilePath(confs[i]));
+    if( file.open(QIODevice::ReadOnly) ){
+      //qDebug() << "Read File:" << confs[i];
+      bool insection = true;
+      QTextStream stream(&file);
+      while(!stream.atEnd()){
+        QString info = stream.readLine();
+        //qDebug() << "Read Line:" << info;
+        if(info.contains("=") && insection){
+          rcdata.insert(info.section("=",0,0).simplified(), info.section("=",1,-1));
+          //qDebug() << "Got data entry:" << info;
+        }else if(info.simplified()=="fi"){ 
+          insection= true;
+        }else if(info.simplified().startsWith("if [ ") ){
+          QStringList args = info.section("]",0,0).section("[",1,-1).split("\""); //odd numbers are files, even are arguments
+          for(int j=0; j<args.length()-1; j+=2){
+            //qDebug() << "Check if arguments:" << args[j] << args[j+1] << insection;
+            if(!args[j].contains("-e")){ insection = false; break; } //don't know how to handle this - skip section
+            if(args[j].contains("-o")){ insection == insection || QFile::exists(args[j+1]); }
+            else if(args[j].contains("-a")){ insection == insection && QFile::exists(args[j+1]); }
+            else{ insection = QFile::exists(args[j+1]); } //typically the first argument check
+            //qDebug() << " - Now:" << insection;
+          } //end loop over existance arguments
+        }
+      }//end loop over lines
+      file.close();
+    }
+  }
+}
diff --git a/src/server/library/sysadm-servicemanager.h b/src/server/library/sysadm-servicemanager.h
index 55c69dc..1f25e7c 100644
--- a/src/server/library/sysadm-servicemanager.h
+++ b/src/server/library/sysadm-servicemanager.h
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QList>
+#include <QHash>
 
 namespace sysadm{
 struct Service{
@@ -77,6 +78,10 @@ public:
 private:
     QList<Service> services;
     Service loadServices(QString service = ""); //Return struct is optional - only used for a single service search
+
+    QHash<QString, QString> rcdata; //rc.conf settings
+    void loadRCdata();
+
     QString chroot;
     QString ip;
 };