p3lib 1.1.94__tar.gz → 1.1.96__tar.gz

{p3lib-1.1.94 → p3lib-1.1.96}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.94
+Version: 1.1.96
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.94 → p3lib-1.1.96}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.94
+version = 1.1.96
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.94 → p3lib-1.1.96}/src/p3lib/boot_manager.py

@@ -27,46 +27,62 @@ class BootManager(object):
         parser.add_argument(BootManager.CHECK_CMD_OPT,   help="Check the status of an auto started icons_gw instance.", action="store_true", default=False)
 
     @staticmethod
-    def HandleOptions(uio, options, enable_syslog):
+    def HandleOptions(uio, options, enable_syslog, appName=None, restartSeconds=1):
         """@brief Handle one of the bot manager command line options if the 
                   user passed it on the cmd line.
            @param uio A UIO instance.
            @param options As returned from parser.parse_args() where parser 
                           is an instance of argparse.ArgumentParser.
            @param enable_syslog True to enable systemd syslog output.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used.
+           @param restartSeconds The number of seconds to sleep before restarting a service that has stopped (default=1).
            @return True if handled , False if not."""
         handled = False
         if options.check_auto_start:
-            BootManager.CheckAutoStartStatus(uio)
+            BootManager.CheckAutoStartStatus(uio, appName)
             handled = True
             
         elif options.enable_auto_start:
-            BootManager.EnableAutoStart(uio, enable_syslog)
+            BootManager.EnableAutoStart(uio, enable_syslog, appName, restartSeconds)
             handled = True
             
         elif options.disable_auto_start:
-            BootManager.DisableAutoStart(uio)
+            BootManager.DisableAutoStart(uio, appName)
             handled = True
 
         return handled
 
     @staticmethod
-    def EnableAutoStart(uio, enable_syslog):
-        """@brief Enable this program to auto start when the computer on which it is installed starts."""
-        bootManager = BootManager(uio=uio, ensureRootUser=True)
+    def EnableAutoStart(uio, enable_syslog, appName, restartSeconds):
+        """@brief Enable this program to auto start when the computer on which it is installed starts.
+           @param uio A UIO instance.
+           @param options As returned from parser.parse_args() where parser 
+                          is an instance of argparse.ArgumentParser.
+           @param enable_syslog True to enable systemd syslog output.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used.
+           @param restartSeconds The number of seconds to sleep before restarting a service that has stopped (default=1)."""
+        bootManager = BootManager(uio=uio, ensureRootUser=True, appName=appName, restartSeconds=restartSeconds)
         arsString = " ".join(sys.argv)
         bootManager.add(argString=arsString, enableSyslog=enable_syslog)
 
     @staticmethod
-    def DisableAutoStart(uio):
-        """@brief Enable this program to auto start when the computer on which it is installed starts."""
-        bootManager = BootManager(uio=uio, ensureRootUser=True)
+    def DisableAutoStart(uio, appName):
+        """@brief Enable this program to auto start when the computer on which it is installed starts.
+           @param uio A UIO instance.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used."""
+        bootManager = BootManager(uio=uio, ensureRootUser=True, appName=appName)
         bootManager.remove()
         
     @staticmethod
-    def CheckAutoStartStatus(uio):
-        """@brief Check the status of a process previously set to auto start."""
-        bootManager = BootManager(uio=uio)
+    def CheckAutoStartStatus(uio, appName):
+        """@brief Check the status of a process previously set to auto start.
+           @param uio A UIO instance.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used."""
+        bootManager = BootManager(uio=uio, appName=appName)
         lines = bootManager.getStatus()
         if lines and len(lines) > 0:
             for line in lines:

{p3lib-1.1.94 → p3lib-1.1.96}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.94
+Version: 1.1.96
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen