avahi Service hinzugefügt

default-file über debian-dir integriert
logsystem closeall bei Programmende
typo pyloadverion in pyloadversion geändert
default xmlport von 55123 auf 55239 geändert
Bugfix: _zeroprocimg

data/etc/avahi/services/revpipyload.service

@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+    <name replace-wildcards="yes">%h</name>
+    <service protocol="ipv4">
+        <type>_revpipyload._tcp</type>
+        <port>55239</port>
+    </service>
+</service-group>

data/etc/default/revpipyload

@@ -1,7 +0,0 @@
-# RevPiPyLoader
-#
-# Verbose logging add a -v or -vv
-DAEMON_ARGS="-d"
-
-# Codepage for Python (do not change)
-export LANG=C.UTF-8

data/etc/revpipyload/revpipyload.conf

@@ -1,14 +1,13 @@
 [DEFAULT]
-autoreload=1
+autoreload = 1
-autostart=1
+autostart = 1
-plcworkdir=/var/lib/revpipyload
+plcworkdir = /var/lib/revpipyload
-plcprogram=program.py
+plcprogram = program.py
-plcarguments=
+plcarguments =
-plcuid=1000
+plcuid = 1000
-plcgid=1000
+plcgid = 1000
-plcslave=0
+plcslave = 0
-pythonversion=3
+pythonversion = 3
-xmlrpc=0
+xmlrpc = 0
-xmlrpcport=55123
+zeroonerror = 0
-zeroonerror=0
+zeroonexit = 0
-zeroonexit=0

debian/revpipyload.default

@@ -0,0 +1,14 @@
+# Defaults for revpipyload initscript
+# sourced by /etc/init.d/revpipyload
+# installed at /etc/default/revpipyload by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+# For verbose logging add a -v or -vv
+DAEMON_ARGS="-d"
+
+# Codepage for Python (do not change)
+export LANG=C.UTF-8

doc/proginit.html

@@ -36,7 +36,7 @@ Functions</h3>
 <hr /><hr />
 <a NAME="_zeroprocimg" ID="_zeroprocimg"></a>
 <h2 style="background-color:#FFFFFF;color:#0000FF">_zeroprocimg</h2>
-<b>_zeroprocimg</b>(<i>self</i>)
+<b>_zeroprocimg</b>(<i></i>)
 <p>
 Setzt Prozessabbild auf NULL.
 </p>

doc/revpipyload.html

@@ -32,7 +32,7 @@ begrenzt werden!
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Global Attributes</h3>
 <table>
-<tr><td>pyloadverion</td></tr>
+<tr><td>pyloadversion</td></tr>
 </table>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 Classes</h3>

eric-revpipyload.api

@@ -24,7 +24,7 @@ procimgserver.ProcimgServer.start?4()
 procimgserver.ProcimgServer.stop?4()
 procimgserver.ProcimgServer.values?4()
 procimgserver.ProcimgServer?1(xmlserver, aclmode)
-proginit._zeroprocimg?5(self)
+proginit._zeroprocimg?5()
 proginit.cleanup?4()
 proginit.configure?4()
 proginit.forked?7
@@ -62,4 +62,4 @@ revpipyload.RevPiPyLoad.xml_reload?4()
 revpipyload.RevPiPyLoad.xml_setconfig?4(dc, loadnow=False)
 revpipyload.RevPiPyLoad.xml_setpictoryrsc?4(filebytes, reset=False)
 revpipyload.RevPiPyLoad?1()
-revpipyload.pyloadverion?7
+revpipyload.pyloadversion?7

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: 2017-09-12, 10:20:24 -->
+<!-- Saved: 2017-09-17, 11:21:23 -->
 <!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -155,6 +155,14 @@
         </key>
         <value>
           <dict>
+            <key>
+              <string>ignoreDirectories</string>
+            </key>
+            <value>
+              <list>
+                <string>demo</string>
+              </list>
+            </value>
             <key>
               <string>ignoreFilePatterns</string>
             </key>
@@ -263,7 +271,7 @@
               <string>ExcludeFiles</string>
             </key>
             <value>
-              <string></string>
+              <string>demo/*</string>
             </value>
             <key>
               <string>ExcludeMessages</string>

revpipyload/proginit.py

@@ -22,7 +22,7 @@ rapcatalog = None
 startdir = None
 
 
-def _zeroprocimg(self):
+def _zeroprocimg():
     """Setzt Prozessabbild auf NULL."""
     procimg = "/dev/piControl0" if pargs is None else pargs.procimg
     if os.access(procimg, os.W_OK):

revpipyload/revpipyload.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # RevPiPyLoad
-# Version: see global var pyloadverion
+# Version: see global var pyloadversion
 #
 # Webpage: https://revpimodio.org/revpipyplc/
 # (c) Sven Sager, License: LGPLv3
@@ -49,7 +49,7 @@ from time import asctime
 from xmlrpc.client import Binary
 from xmlrpc.server import SimpleXMLRPCServer
 
-pyloadverion = "0.4.3"
+pyloadversion = "0.4.5"
 
 
 class RevPiPyLoad():
@@ -142,7 +142,7 @@ class RevPiPyLoad():
             self.xsrv = SimpleXMLRPCServer(
                 (
                     "",
-                    int(self.globalconfig["DEFAULT"].get("xmlrpcport", 55123))
+                    int(self.globalconfig["DEFAULT"].get("xmlrpcport", 55239))
                 ),
                 logRequests=False,
                 allow_none=True
@@ -203,7 +203,7 @@ class RevPiPyLoad():
                 self.xsrv.register_function(
                     self.xml_setpictoryrsc, "set_pictoryrsc")
 
-            self.xsrv.register_function(lambda: pyloadverion, "version")
+            self.xsrv.register_function(lambda: pyloadversion, "version")
             self.xsrv.register_function(lambda: self.xmlrpc, "xmlmodus")
             proginit.logger.debug("created xmlrpc server")
 
@@ -378,6 +378,9 @@ class RevPiPyLoad():
             self.tpe.shutdown()
             self.xsrv.server_close()
 
+        # Logreader schließen
+        self.logr.closeall()
+
         proginit.logger.debug("leave RevPiPyLoad.stop()")
 
     def xml_getconfig(self):
@@ -394,7 +397,7 @@ class RevPiPyLoad():
         dc["pythonversion"] = self.pythonver
         dc["xmlrpc"] = self.xmlrpc
         dc["xmlrpcport"] = \
-            self.globalconfig["DEFAULT"].get("xmlrpcport", 55123)
+            self.globalconfig["DEFAULT"].get("xmlrpcport", 55239)
         dc["zeroonerror"] = self.zeroonerror
         dc["zeroonexit"] = self.zeroonexit
         return dc
@@ -455,7 +458,6 @@ class RevPiPyLoad():
             -3 Lief nie
 
         """
-        # NOTE: proginit.logger.debug("xmlrpc call plcexitcode")
         if self.plc is None:
             return -2
         elif self.plc.is_alive():

setup.py

@@ -27,17 +27,23 @@ setup(
 
     license="LGPLv3",
     name="revpipyload",
-    version="0.4.3",
+    version="0.4.5",
 
     scripts=["data/revpipyload"],
 
     install_requires=["revpimodio"],
 
     data_files=[
-        ("/etc/default", ["data/etc/default/revpipyload"]),
+        ("/etc/avahi/services", [
-        ("/etc/revpipyload", ["data/etc/revpipyload/revpipyload.conf"]),
+            "data/etc/avahi/services/revpipyload.service",
+        ]),
+        ("/etc/revpipyload", [
+            "data/etc/revpipyload/revpipyload.conf",
+        ]),
         ("share/revpipyload", glob("revpipyload/*.*")),
-        ("/var/lib/revpipyload", ["data/var/lib/revpipyload/.placeholder"])
+        ("/var/lib/revpipyload", [
+            "data/var/lib/revpipyload/.placeholder",
+        ])
     ],
 
     description="PLC Loader für Python-Projekte auf den RevolutionPi",