autoreloaddelay implementiert

Update der IpAclManager-Klasse
2025-11-08 15:13:52 +01:00 · 2018-04-03 20:29:26 +02:00
parent da4f912605
commit bee833f28e
10 changed files with 109 additions and 57 deletions
--- a/doc/helper.html
+++ b/doc/helper.html
@@ -68,6 +68,9 @@ Methods</h3>
 <td><a style="color:#0000FF" href="#IpAclManager.__get_regex_acl">__get_regex_acl</a></td>
 <td>Gibt formatierten RegEx-String zurueck.</td>
 </tr><tr>
+<td><a style="color:#0000FF" href="#IpAclManager.__iter__">__iter__</a></td>
+<td>Gibt einzelne ACLs als <class 'tuple'> aus.</td>
+</tr><tr>
 <td><a style="color:#0000FF" href="#IpAclManager.__set_acl">__set_acl</a></td>
 <td>Uebernimmt neue ACL-Liste fuer die Ausertung der Level.</td>
 </tr><tr>
@@ -86,11 +89,17 @@ Static Methods</h3>
 <a NAME="IpAclManager.__init__" ID="IpAclManager.__init__"></a>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 IpAclManager (Constructor)</h3>
-<b>IpAclManager</b>(<i>acl=None, minlevel=0, maxlevel=0</i>)
+<b>IpAclManager</b>(<i>minlevel, maxlevel, acl=None</i>)
 <p>
 Init IpAclManager class.
 </p><dl>
-<dt><i>acl</i></dt>
+<dt><i>minlevel</i></dt>
+<dd>
+Smallest access level (min. 0)
+</dd><dt><i>maxlevel</i></dt>
+<dd>
+Biggest access level (max. 9)
+</dd><dt><i>acl</i></dt>
 <dd>
 ACL Liste fuer Berechtigungen als <class 'str'>
 </dd>
@@ -108,6 +117,12 @@ IpAclManager.__get_regex_acl</h3>
 <p>
 Gibt formatierten RegEx-String zurueck.
        return RegEx Code als <class 'str'>
+</p><a NAME="IpAclManager.__iter__" ID="IpAclManager.__iter__"></a>
+<h3 style="background-color:#FFFFFF;color:#FF0000">
+IpAclManager.__iter__</h3>
+<b>__iter__</b>(<i></i>)
+<p>
+Gibt einzelne ACLs als <class 'tuple'> aus.
 </p><a NAME="IpAclManager.__set_acl" ID="IpAclManager.__set_acl"></a>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 IpAclManager.__set_acl</h3>
--- a/doc/xrpcserver.html
+++ b/doc/xrpcserver.html
@@ -125,7 +125,7 @@ Static Methods</h3>
 <a NAME="SaveXMLRPCServer.__init__" ID="SaveXMLRPCServer.__init__"></a>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 SaveXMLRPCServer (Constructor)</h3>
-<b>SaveXMLRPCServer</b>(<i>addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=IpAclManager()</i>)
+<b>SaveXMLRPCServer</b>(<i>addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=None</i>)
 <p>
 Init SaveXMLRPCServer class.
 </p><a NAME="SaveXMLRPCServer._dispatch" ID="SaveXMLRPCServer._dispatch"></a>
--- a/eric-revpipyload.api
+++ b/eric-revpipyload.api
@@ -1,11 +1,12 @@
 helper.IpAclManager.__get_acl?6()
 helper.IpAclManager.__get_regex_acl?6()
+helper.IpAclManager.__iter__?6()
 helper.IpAclManager.__set_acl?6(value)
 helper.IpAclManager.acl?7
 helper.IpAclManager.get_acllevel?4(ipaddress)
 helper.IpAclManager.loadacl?4(str_acl)
 helper.IpAclManager.regex_acl?7
-helper.IpAclManager?1(acl=None, minlevel=0, maxlevel=0)
+helper.IpAclManager?1(minlevel, maxlevel, acl=None)
 helper._setuprt?5(pid, evt_exit)
 helper._zeroprocimg?5()
 helper.refullmatch?4(regex, string)
@@ -90,4 +91,4 @@ xrpcserver.SaveXMLRPCServer.isAlive?4()
 xrpcserver.SaveXMLRPCServer.register_function?4(acl_level, function, name=None)
 xrpcserver.SaveXMLRPCServer.start?4()
 xrpcserver.SaveXMLRPCServer.stop?4()
-xrpcserver.SaveXMLRPCServer?1(addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=IpAclManager())
+xrpcserver.SaveXMLRPCServer?1(addr, logRequests=True, allow_none=False, use_builtin_types=False, ipacl=None)
--- a/revpipyload.e4p
+++ b/revpipyload.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project revpipyload -->
-<!-- Saved: 2018-03-08, 10:56:15 -->
+<!-- Saved: 2018-04-03, 20:12:25 -->
 <!-- Copyright (C) 2018 Sven Sager, akira@narux.de -->
 <Project version="5.1">
  <Language>en_US</Language>
@@ -9,7 +9,7 @@
  <ProgLanguage mixed="0">Python3</ProgLanguage>
  <ProjectType>Console</ProjectType>
  <Description>Dieser Loader wird über das Init-System geladen und führt das angegebene Pythonprogramm aus. Es ist für den RevolutionPi gedacht um automatisch das SPS-Programm zu starten.</Description>
-  <Version>0.6.0</Version>
+  <Version>0.6.1</Version>
  <Author>Sven Sager</Author>
  <Email>akira@narux.de</Email>
  <Eol index="1"/>
--- a/revpipyload/helper.py
+++ b/revpipyload/helper.py
@@ -16,17 +16,28 @@ class IpAclManager():

    """Verwaltung fuer IP Adressen und deren ACL Level."""

-    def __init__(self, acl=None, minlevel=0, maxlevel=0):
+    def __init__(self, minlevel, maxlevel, acl=None):
        """Init IpAclManager class.
-        @param acl ACL Liste fuer Berechtigungen als <class 'str'>"""
-        if minlevel > maxlevel:
-            raise ValueError("minlevel is smaller than maxlevel")
+
+        @param minlevel Smallest access level (min. 0)
+        @param maxlevel Biggest access level (max. 9)
+        @param acl ACL Liste fuer Berechtigungen als <class 'str'>
+
+        """
+        if type(minlevel) != int:
+            raise ValueError("parameter minlevel must be <class 'int'>")
+        if type(maxlevel) != int:
+            raise ValueError("parameter maxlevel must be <class 'int'>")
        if minlevel < 0:
            raise ValueError("minlevel must be 0 or more")
+        if maxlevel > 9:
+            raise ValueError("maxlevel maximum is 9")
+        if minlevel > maxlevel:
+            raise ValueError("minlevel is smaller than maxlevel")

        self.__dict_acl = {}
-        self.__dict_ips = {}
-        self.__rawacl = ""
+        self.__dict_regex = {}
+        self.__dict_knownips = {}
        self.__re_ipacl = "(([\\d\\*]{1,3}\\.){3}[\\d\\*]{1,3},[" \
            + str(minlevel) + "-" + str(maxlevel) + "] ?)*"

@@ -34,10 +45,18 @@ class IpAclManager():
        if acl is not None:
            self.__set_acl(acl)

+    def __iter__(self):
+        """Gibt einzelne ACLs als <class 'tuple'> aus."""
+        for aclip in sorted(self.__dict_acl):
+            yield (aclip, self.__dict_acl[aclip])
+
    def __get_acl(self):
        """Getter fuer den rohen ACL-String.
        return ACLs als <class 'str'>"""
-        return self.__rawacl
+        str_acl = ""
+        for aclip in sorted(self.__dict_acl):
+            str_acl += "{},{} ".format(aclip, self.__dict_acl[aclip])
+        return str_acl.strip()

    def __get_regex_acl(self):
        """Gibt formatierten RegEx-String zurueck.
@@ -50,32 +69,34 @@ class IpAclManager():
        if type(value) != str:
            raise ValueError("parameter acl must be <class 'str'>")

+        value = value.strip()
        if not refullmatch(self.__re_ipacl, value):
            raise ValueError("acl format ist not okay - 1.2.3.4,0 5.6.7.8,1")

        # Klassenwerte übernehmen
        self.__dict_acl = {}
-        self.__dict_ips = {}
-        self.__rawacl = value
+        self.__dict_regex = {}
+        self.__dict_knownips = {}

        # Liste neu füllen mit regex Strings
        for ip_level in value.split():
            ip, level = ip_level.split(",", 1)
-            ip = ip.replace(".", "\\.").replace("*", "\\d{1,3}")
            self.__dict_acl[ip] = int(level)
+            self.__dict_regex[ip] = \
+                ip.replace(".", "\\.").replace("*", "\\d{1,3}")

    def get_acllevel(self, ipaddress):
        """Prueft IP gegen ACL List und gibt ACL-Wert aus.
        @param ipaddress zum pruefen
        @return <class 'int'> ACL Wert oder -1 wenn nicht gefunden"""
        # Bei bereits aufgelösten IPs direkt ACL auswerten
-        if ipaddress in self.__dict_ips:
-            return self.__dict_ips[ipaddress]
+        if ipaddress in self.__dict_knownips:
+            return self.__dict_knownips[ipaddress]

        for aclip in sorted(self.__dict_acl, reverse=True):
-            if refullmatch(aclip, ipaddress):
+            if refullmatch(self.__dict_regex[aclip], ipaddress):
                # IP und Level merken
-                self.__dict_ips[ipaddress] = self.__dict_acl[aclip]
+                self.__dict_knownips[ipaddress] = self.__dict_acl[aclip]

                # Level zurückgeben
                return self.__dict_acl[aclip]
@@ -86,10 +107,10 @@ class IpAclManager():
        """Laed ACL String und gibt erfolg zurueck.
        @param str_acl ACL als <class 'str'>
        @return True, wenn erfolgreich uebernommen"""
-        if refullmatch(self.__re_ipacl, str_acl):
-            self.__set_acl(str_acl)
-            return True
-        return False
+        if not refullmatch(self.__re_ipacl, str_acl):
+            return False
+        self.__set_acl(str_acl)
+        return True

    acl = property(__get_acl, __set_acl)
    regex_acl = property(__get_regex_acl)
--- a/revpipyload/plcsystem.py
+++ b/revpipyload/plcsystem.py
@@ -39,6 +39,7 @@ class RevPiPlc(Thread):
        self._procplc = None
        self._pversion = pversion
        self.autoreload = False
+        self.autoreloaddelay = 5 * 2
        self.exitcode = None
        self.gid = 65534
        self.uid = 65534
@@ -131,44 +132,54 @@ class RevPiPlc(Thread):
            _setuprt(self._procplc.pid, self._evt_exit)

        # Überwachung starten
+        delaycounter = self.autoreloaddelay
        while not self._evt_exit.is_set():

            # Auswerten
            self.exitcode = self._procplc.poll()

            if self.exitcode is not None:
-                if self.exitcode > 0:
-                    # PLC Python Programm abgestürzt
-                    proginit.logger.error(
-                        "plc program crashed - exitcode: {}".format(
-                            self.exitcode
+                if delaycounter == self.autoreloaddelay:
+                    if self.exitcode > 0:
+                        # PLC Python Programm abgestürzt
+                        proginit.logger.error(
+                            "plc program crashed - exitcode: {}".format(
+                                self.exitcode
+                            )
                        )
-                    )
-                    if self.zeroonerror:
-                        _zeroprocimg()
-                        proginit.logger.warning(
-                            "set piControl0 to ZERO after PLC program error")
+                        if self.zeroonerror:
+                            _zeroprocimg()
+                            proginit.logger.warning(
+                                "set piControl0 to ZERO after "
+                                "PLC program error"
+                            )

-                else:
-                    # PLC Python Programm sauber beendet
-                    proginit.logger.info("plc program did a clean exit")
-                    if self.zeroonexit:
-                        _zeroprocimg()
-                        proginit.logger.info(
-                            "set piControl0 to ZERO after PLC program returns "
-                            "clean exitcode")
+                    else:
+                        # PLC Python Programm sauber beendet
+                        proginit.logger.info("plc program did a clean exit")
+                        if self.zeroonexit:
+                            _zeroprocimg()
+                            proginit.logger.info(
+                                "set piControl0 to ZERO after "
+                                "PLC program returns clean exitcode"
+                            )

                if not self._evt_exit.is_set() and self.autoreload:
-                    # Prozess neu starten
-                    self._procplc = self._spopen(lst_proc)
-                    if self.exitcode == 0:
-                        proginit.logger.warning(
-                            "restart plc program after clean exit"
-                        )
+                    if delaycounter > 0:
+                        delaycounter -= 1
                    else:
-                        proginit.logger.warning(
-                            "restart plc program after crash"
-                        )
+                        delaycounter = self.autoreloaddelay
+
+                        # Prozess neu starten
+                        self._procplc = self._spopen(lst_proc)
+                        if self.exitcode == 0:
+                            proginit.logger.warning(
+                                "restart plc program after clean exit"
+                            )
+                        else:
+                            proginit.logger.warning(
+                                "restart plc program after crash"
+                            )
                else:
                    break

--- a/revpipyload/revpipyload.py
+++ b/revpipyload/revpipyload.py
@@ -49,7 +49,7 @@ from time import asctime
 from xmlrpc.client import Binary
 from xrpcserver import SaveXMLRPCServer

-pyloadversion = "0.6.0"
+pyloadversion = "0.6.1"


 class RevPiPyLoad():
@@ -305,6 +305,7 @@ class RevPiPyLoad():
            self.pythonversion
        )
        th_plc.autoreload = bool(self.autoreload)
+        th_plc.autoreloaddelay = self.autoreloaddelay
        th_plc.gid = int(self.plcgid)
        th_plc.uid = int(self.plcuid)
        th_plc.rtlevel = int(self.rtlevel)
--- a/revpipyload/xrpcserver.py
+++ b/revpipyload/xrpcserver.py
@@ -18,7 +18,7 @@ class SaveXMLRPCServer(SimpleXMLRPCServer):

    def __init__(
            self, addr, logRequests=True, allow_none=False,
-            use_builtin_types=False, ipacl=IpAclManager()):
+            use_builtin_types=False, ipacl=None):
        """Init SaveXMLRPCServer class."""
        proginit.logger.debug("enter SaveXMLRPCServer.__init__()")

@@ -34,7 +34,10 @@ class SaveXMLRPCServer(SimpleXMLRPCServer):
        )

        # Klassenvariablen
-        self.aclmgr = ipacl
+        if ipacl is None:
+            self.aclmgr = IpAclManager(0, 0)
+        else:
+            self.aclmgr = ipacl
        self.funcacls = {}
        self.requestacl = -1
        self.tpe = futures.ThreadPoolExecutor(max_workers=1)
--- a/setup.py
+++ b/setup.py
@@ -27,11 +27,12 @@ setup(

    license="LGPLv3",
    name="revpipyload",
-    version="0.6.0",
+    version="0.6.1",

    scripts=["data/revpipyload"],

    install_requires=["revpimodio2"],
+    python_requires=">=3.2",

    data_files=[
        ("/etc/avahi/services", [
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -3,4 +3,3 @@ Debian-Version: 1
 Depends3: python3-revpimodio2 (>= 2.0.0)
 Package: revpipyload
 Suite: stable
-X-Python3-Version: >=3.2