Mit default zusammenführen

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

@@ -3,7 +3,7 @@ autoreload = 1
 autostart = 1
 plcworkdir = /var/lib/revpipyload
 plcprogram = program.py
-plcarguments=
+plcarguments =
 plcuid = 1000
 plcgid = 1000
 plcslave = 0
@@ -12,6 +12,5 @@ plcslaveport = 55234
 pythonversion = 3
 xmlrpc = 0
 xmlrpcacl =
-xmlrpcport = 55123
 zeroonerror = 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>

eric-revpipyload.api

@@ -31,7 +31,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

revpipyload.e4p

@@ -156,6 +156,14 @@
         </key>
         <value>
           <dict>
+            <key>
+              <string>ignoreDirectories</string>
+            </key>
+            <value>
+              <list>
+                <string>demo</string>
+              </list>
+            </value>
             <key>
               <string>ignoreFilePatterns</string>
             </key>
@@ -264,7 +272,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

@@ -200,7 +200,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
@@ -454,6 +454,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):
@@ -473,7 +476,7 @@ class RevPiPyLoad():
         dc["xmlrpc"] = self.xmlrpc
         dc["xmlrpcacl"] = self.xmlrpcacl
         dc["xmlrpcport"] = \
-            self.globalconfig["DEFAULT"].get("xmlrpcport", 55123)
+            self.globalconfig["DEFAULT"].get("xmlrpcport", 55239)
         dc["zeroonerror"] = self.zeroonerror
         dc["zeroonexit"] = self.zeroonexit
         return dc
@@ -534,7 +537,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

@@ -34,10 +34,16 @@ setup(
     install_requires=["revpimodio"],
 
     data_files=[
-        ("/etc/default", ["data/etc/default/revpipyload"]),
-        ("/etc/revpipyload", ["data/etc/revpipyload/revpipyload.conf"]),
+        ("/etc/avahi/services", [
+            "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",