V1.19.02

changelog.md

@@ -10,6 +10,8 @@ All notable changes to this project will be documented in this file.
 - Minor error handling update in Fuel Logger thread
 - Minor update to controller detection for custom controller models
 - Update for 26kw Evo2 air cooled model
+- Update to genmonmaint.sh for managed python environments
+- update for paho-mqtt version change
 
 ## V1.19.01 -2023-12-06
 - Update to genmonmaint.sh to ask about serial connection type on install (thanks @skipfire)

genmon.py

@@ -191,18 +191,22 @@ def __init__(self, ConfigFilePath=ProgramDefaults.ConfPath):
             self.InterfaceServerThread, Name="InterfaceServerThread"
         )
 
-        # init mail, start processing incoming email
-        self.mail = MyMail(
-            monitor=True,
-            incoming_folder=self.IncomingEmailFolder,
-            processed_folder=self.ProcessedEmailFolder,
-            incoming_callback=self.ProcessCommand,
-            loglocation=self.LogLocation,
-            ConfigFilePath=ConfigFilePath,
-        )
+        try:
+            # init mail, start processing incoming email
+            self.mail = MyMail(
+                monitor=True,
+                incoming_folder=self.IncomingEmailFolder,
+                processed_folder=self.ProcessedEmailFolder,
+                incoming_callback=self.ProcessCommand,
+                loglocation=self.LogLocation,
+                ConfigFilePath=ConfigFilePath,
+            )
 
-        self.Threads = self.MergeDicts(self.Threads, self.mail.Threads)
-        self.MailInit = True
+            self.Threads = self.MergeDicts(self.Threads, self.mail.Threads)
+            self.MailInit = True
+        except Exception as e1:
+            self.LogErrorLine("Error loading mail support: " + str(e1))
+            sys.exit(1)
 
         self.FeedbackPipe = MyPipe(
             "Feedback",

genmonlib/mymail.py

@@ -84,6 +84,7 @@ def __init__(
             self.log = SetupLogger("mymail", self.logfile)
         else:
             self.log = log
+        self.console = None
 
         # if mymail.conf is present attempt to copy it from the
         # main source directory
@@ -92,7 +93,7 @@ def __init__(
                 copyfile(os.path.join(self.ModulePath, "mymail.conf"), self.configfile)
             else:
                 self.LogError("Missing config file : " + self.configfile)
-                sys.exit(1)
+                self.FatalError("Missing config file : " + self.configfile)
 
         self.config = MyConfig(filename=self.configfile, section="MyMail", log=self.log)
 

genmonmaint.sh

@@ -144,7 +144,6 @@ function installrpirtscts() {
 # This function will install the required libraries for genmon
 function installgenmon() {
 
-    checkmanagedpackages
     echo "Installing genmon package requirements...."
     # possibly use "sudo easy_install3 -U pip"
     sudo apt-get -yqq update
@@ -450,6 +449,8 @@ if [ "$update_os" = true ] ; then
    sudo apt-get --allow-releaseinfo-change update && sudo apt-get upgrade
 fi
 
+checkmanagedpackages
+
 if [ "$install_opt" = true ] ; then
   if [ "$noprompt_opt" = true ] ; then
     installgenmon "noprompt"