From a48c7f08f1153cb5c788a14741817a1beaf9a931 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Fri, 27 Oct 2023 22:03:11 +0200
Subject: [PATCH] adjusted daemon process starting

---
 gui/src/components/main.vue |  4 ++--
 modem/daemon.py             | 29 ++++++-----------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue
index 070efcdd..68aaba6d 100644
--- a/gui/src/components/main.vue
+++ b/gui/src/components/main.vue
@@ -156,9 +156,9 @@ function stopAllTransmissions() {
               <!-------------------------------- MAIN AREA ---------------->
 
               <!------------------------------------------------------------------------------------------>
-              <div class="container p-3">
+              <div class="container">
                 <div
-                  class="row collapse multi-collapse show mt-4"
+                  class="row collapse multi-collapse show mt-3"
                   id="collapseFirstRow"
                 >
                   <div class="col">
diff --git a/modem/daemon.py b/modem/daemon.py
index 033edf81..f75f8756 100755
--- a/modem/daemon.py
+++ b/modem/daemon.py
@@ -88,28 +88,15 @@ class DAEMON:
         """
         while True:
             threading.Event().wait(0.01)
-            try:
-                print(Daemon.rigctldprocess)
-                result = Daemon.rigctldprocess
-                print(f'Standard Output: {result.stdout}')
-                print(f'Standard Error: {result.stderr}')
-            except Exception:
-                pass
-
 
             # only continue, if we have a process object initialized
             if hasattr(Daemon.rigctldprocess, "returncode"):
 
                 if Daemon.rigctldprocess.returncode in [None, "None"] or not Daemon.rigctldstarted:
                     Daemon.rigctldstarted = True
-                    #outs, errs = Daemon.rigctldprocess.communicate(timeout=10)
-                    #print(f"outs: {outs}")
-                    #print(f"errs: {errs}")
-                    print(Daemon.rigctldprocess)
-                    result = Daemon.rigctldprocess
-                    print(f'Standard Output: {result.stdout}')
-                    print(f'Standard Error: {result.stderr}')
-
+                    outs, errs = Daemon.rigctldprocess.communicate(timeout=10)
+                    print(f"outs: {outs}")
+                    print(f"errs: {errs}")
 
                 else:
                     self.log.warning("[DMN] [RIGCTLD] [Watchdog] returncode detected",process=Daemon.rigctldprocess)
@@ -119,8 +106,8 @@ class DAEMON:
                     # erase process object
                     Daemon.rigctldprocess = None
             else:
-                #Daemon.rigctldstarted = False
-                pass
+                Daemon.rigctldstarted = False
+
             #try:
             #    outs, errs = proc.communicate(timeout=15)
             #except TimeoutExpired:
@@ -428,18 +415,14 @@ class DAEMON:
                 #proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
                 #proc = subprocess.Popen(command)
                 proc = subprocess.run(command, shell=False, check=True, text=True, capture_output=True)
-                print(f'Standard Output: {proc.stdout}')
-                print(f'Standard Error: {proc.stderr}')
             else:
                 #On windows, open rigctld in new window for easier troubleshooting
                 proc = subprocess.Popen(command, creationflags=subprocess.CREATE_NEW_CONSOLE,close_fds=True)
 
-            atexit.register(proc.kill)
-
             Daemon.rigctldstarted = True
             Daemon.rigctldprocess = proc
 
-
+            atexit.register(proc.kill)
 
         except Exception as err:
             self.log.warning("[DMN] err starting rigctld: ", e=err)