From 84eb0272417e553ee2c20fee1b73bc0703ce66da Mon Sep 17 00:00:00 2001
From: dj2ls <dj2ls@protonmail.com>
Date: Mon, 21 Feb 2022 17:58:44 +0100
Subject: [PATCH] path update for log files

---
 gui/main.js   |  6 +++---
 tnc/daemon.py | 28 +++++++++++++++-------------
 tnc/main.py   | 31 ++++++++++++++++++-------------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/gui/main.js b/gui/main.js
index 6e15528e..cf853d35 100644
--- a/gui/main.js
+++ b/gui/main.js
@@ -218,13 +218,13 @@ app.whenReady().then(() => {
     
     if(os.platform()=='win32' || os.platform()=='win64'){
         // for windows the relative path via path.join(__dirname) is not needed for some reason 
-        //daemonProcess = exec('\\tnc\\daemon.exe', [])
-        
+        daemonProcess = exec('\\tnc\\daemon.exe', [])
+        /*
         daemonProcess = exec(path.join(process.resourcesPath, 'tnc', 'daemon.exe'), [], 
             {   
                 cwd: path.join(process.resourcesPath, 'tnc'),              
             });
-                
+        */        
     }
 
     // return process messages
diff --git a/tnc/daemon.py b/tnc/daemon.py
index fd807c1a..83054d4e 100755
--- a/tnc/daemon.py
+++ b/tnc/daemon.py
@@ -290,19 +290,21 @@ if __name__ == '__main__':
     PARSER.add_argument('--port', dest="socket_port",default=3001, help="Socket port", type=int)   
     ARGS = PARSER.parse_args()
     static.DAEMONPORT = ARGS.socket_port
-    
-    if sys.platform == 'linux':
-        logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'daemon'
-        
-    if sys.platform == 'darwin':
-        logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'daemon' 
-           
-    if sys.platform == 'win32' or sys.platform == 'win64':
-        logging_path = os.getenv('APPDATA') + '/' + 'FreeDATA/' + 'daemon'  
-          
-    log_handler.setup_logging(logging_path)
-
-
+    try:
+        if sys.platform == 'linux':
+            logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'daemon'
+            
+        if sys.platform == 'darwin':
+            logging_path = os.getenv("HOME") + '/Library/' + 'Application Support' + 'FreeDATA/' + 'daemon' 
+               
+        if sys.platform == 'win32' or sys.platform == 'win64':
+            logging_path = os.getenv('APPDATA') + '/' + 'FreeDATA/' + 'daemon'  
+              
+        if not os.path.exists(logging_path):
+            os.makedirs(logging_path)
+        log_handler.setup_logging(logging_path)
+    except:
+       structlog.get_logger("structlog").error("[TNC] logger init error")       
 
     try:
         structlog.get_logger("structlog").info("[DMN] Starting TCP/IP socket", port=static.DAEMONPORT)
diff --git a/tnc/main.py b/tnc/main.py
index ae9f30b0..43ad9e43 100644
--- a/tnc/main.py
+++ b/tnc/main.py
@@ -18,6 +18,7 @@ import structlog
 import log_handler
 import modem
 import sys
+import os
 import signal
 import time
 import multiprocessing
@@ -88,19 +89,23 @@ if __name__ == '__main__':
     # we need to wait until we got all parameters from argparse first before we can load the other modules
     import sock     
     
-    # config logging
-    
-    
-    if sys.platform == 'linux':
-        logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'tnc'
-        
-    if sys.platform == 'darwin':
-        logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'tnc' 
-           
-    if sys.platform == 'win32' or sys.platform == 'win64':
-        logging_path = os.getenv('APPDATA') + '/' + 'FreeDATA/' + 'tnc'  
-          
-    log_handler.setup_logging(logging_path)
+    # config logging  
+    try:  
+        if sys.platform == 'linux':
+            logging_path = os.getenv("HOME") + '/.config/' + 'FreeDATA/' + 'tnc'
+            
+        if sys.platform == 'darwin':
+            logging_path = os.getenv("HOME") + '/Library/' + 'Application Support' + 'FreeDATA/' + 'tnc' 
+               
+        if sys.platform == 'win32' or sys.platform == 'win64':
+            logging_path = os.getenv('APPDATA') + '/' + 'FreeDATA/' + 'tnc'  
+         
+        if not os.path.exists(logging_path):
+            os.makedirs(logging_path)
+        log_handler.setup_logging(logging_path)
+    except:
+           structlog.get_logger("structlog").error("[DMN] logger init error")       
+
     
     
     structlog.get_logger("structlog").info("[TNC] Starting FreeDATA", author="DJ2LS", year="2022", version="0.1")