reworked PR comments and requests

henne49 · May 27, 2024 · 1f47ed2 · 1f47ed2
1 parent 680e392
commit 1f47ed2
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,6 @@ The following commands should do everything for you:
 wget -O main.zip https://github.com/henne49/dbus-opendtu/archive/refs/heads/main.zip
 unzip main.zip "dbus-opendtu-main/*" -d /data
 mv /data/dbus-opendtu-main /data/dbus-opendtu
-rm /data/dbus-opendtu/current.log*
 chmod a+x /data/dbus-opendtu/install.sh
 ```
 
@@ -84,24 +83,19 @@ Just grap a copy of the main branch and copy the content to `/data/` e.g. `/data
 After that call the `install.sh script.
 
 ```bash
+cp /data/dbus-opendtu/config.ini /data/dbus-opendtu/config.backup
 wget -O main.zip https://github.com/henne49/dbus-opendtu/archive/refs/heads/main.zip
 unzip main.zip "dbus-opendtu-main/*" -d /data
-rm /data/dbus-opendtu/current.log*
 mv /data/dbus-opendtu-main/config.ini /data/dbus-opendtu-main/config.template
 cp -R /data/dbus-opendtu-main/* /data/dbus-opendtu
 rm -rf /data/dbus-opendtu-main/
-cp /data/dbus-opendtu/config.ini /data/dbus-opendtu/config.backup
 chmod a+x /data/dbus-opendtu/install.sh
-```
-
-Tha last step is to install the service and remove the downloaded files:
-
-```bash
 /data/dbus-opendtu/uninstall.sh
 /data/dbus-opendtu/install.sh
 /data/dbus-opendtu/restart.sh
 rm main.zip
 ```
+The last 4 step is to install the service and remove the downloaded files:
 
 If the script does not work or start, please check the config.template file and update your config.ini. Or reconfigure the config.template with your configuration and save as config.ini. The process also creates a copy of your old config.ini called config.backup.
 

diff --git a/dbus-opendtu.py b/dbus-opendtu.py
@@ -35,12 +35,16 @@ def main():
     dtuvariant = config["DEFAULT"]["DTU"]
     try:
         number_of_inverters = int(config["DEFAULT"]["NumberOfInvertersToQuery"])
-    except Exception:
+    except (KeyError, ValueError) as ex:
+        logging.warning("NumberOfInvertersToQuery: %s", ex)
+        logging.warning("NumberOfInvertersToQuery not set, using default")
         number_of_inverters = 0
 
     try:
         number_of_templates = int(config["DEFAULT"]["NumberOfTemplates"])
-    except Exception:
+    except (KeyError, ValueError) as ex:
+        logging.warning("NumberOfTemplates: %s", ex)
+        logging.warning("NumberOfTemplates not set, using default")
         number_of_templates = 0
 
     logging.basicConfig(

diff --git a/dbus_service.py b/dbus_service.py
@@ -205,8 +205,8 @@ def _read_config_dtu(self, actual_inverter):
         try:
             self.max_age_ts = int(config["DEFAULT"]["MaxAgeTsLastSuccess"])
         except (KeyError, ValueError) as ex:
-            logging.debug("MaxAgeTsLastSuccess: %s", ex)
-            logging.debug("MaxAgeTsLastSuccess not set, using default")
+            logging.warning("MaxAgeTsLastSuccess: %s", ex)
+            logging.warning("MaxAgeTsLastSuccess not set, using default")
             self.max_age_ts = 600
 
         self.dry_run = is_true(get_default_config(config, "DryRun", False))
@@ -260,8 +260,8 @@ def _read_config_template(self, template_number):
         try:
             self.max_age_ts = int(config["DEFAULT"]["MaxAgeTsLastSuccess"])
         except (KeyError, ValueError) as ex:
-            logging.debug("MaxAgeTsLastSuccess: %s", ex)
-            logging.debug("MaxAgeTsLastSuccess not set, using default")
+            logging.warning("MaxAgeTsLastSuccess: %s", ex)
+            logging.warning("MaxAgeTsLastSuccess not set, using default")
             self.max_age_ts = 600
 
         self.dry_run = is_true(get_default_config(config, "DryRun", False))

diff --git a/install.sh b/install.sh
@@ -2,6 +2,11 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 SERVICE_NAME=$(basename $SCRIPT_DIR)
 
+# delete old logs if they exist  
+if [ -f /data/dbus-opendtu/current.log ]; then  
+    rm /data/dbus-opendtu/current.log*  
+fi 
+
 # set permissions for script files
 chmod a+x $SCRIPT_DIR/restart.sh
 chmod 744 $SCRIPT_DIR/restart.sh

diff --git a/service/log/run b/service/log/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 exec 2>&1
-exec multilog t s25000 n4 /var/log/dbus-opendtu
+# documentation on how to use multilog https://manpages.debian.org/stretch/daemontools/multilog.8.en.html
+exec multilog t s153600 n2 /var/log/dbus-opendtu
diff --git a/uninstall.sh b/uninstall.sh
@@ -2,9 +2,14 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 SERVICE_NAME=$(basename $SCRIPT_DIR)
 filename=/data/rc.local
+
+#remove the service
 rm /service/$SERVICE_NAME
+
+# end the dbus-opendtu process
 kill $(pgrep -f 'supervise dbus-opendtu')
-chmod a-x $SCRIPT_DIR/service/run
-$SCRIPT_DIR/restart.sh
-STARTUP=$SCRIPT_DIR/install.sh
-sed -i "\~$STARTUP~d" $filename
+
+# delete old logs if they exist  
+if [ -f /data/dbus-opendtu/current.log ]; then  
+    rm /data/dbus-opendtu/current.log*  
+fi