diff --git a/data/etc/avahi/services/revpipyload.service b/data/etc/avahi/services/revpipyload.service
new file mode 100644
index 0000000..666966a
--- /dev/null
+++ b/data/etc/avahi/services/revpipyload.service
@@ -0,0 +1,9 @@
+
+
+
+ %h
+
+ _revpipyload._tcp
+ 55239
+
+
diff --git a/data/etc/default/revpipyload b/data/etc/default/revpipyload
deleted file mode 100644
index 2d164d4..0000000
--- a/data/etc/default/revpipyload
+++ /dev/null
@@ -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
diff --git a/data/etc/revpipyload/revpipyload.conf b/data/etc/revpipyload/revpipyload.conf
index 58ea476..3731ac9 100644
--- a/data/etc/revpipyload/revpipyload.conf
+++ b/data/etc/revpipyload/revpipyload.conf
@@ -1,14 +1,13 @@
[DEFAULT]
-autoreload=1
-autostart=1
-plcworkdir=/var/lib/revpipyload
-plcprogram=program.py
-plcarguments=
-plcuid=1000
-plcgid=1000
-plcslave=0
-pythonversion=3
-xmlrpc=0
-xmlrpcport=55123
-zeroonerror=0
-zeroonexit=0
+autoreload = 1
+autostart = 1
+plcworkdir = /var/lib/revpipyload
+plcprogram = program.py
+plcarguments =
+plcuid = 1000
+plcgid = 1000
+plcslave = 0
+pythonversion = 3
+xmlrpc = 0
+zeroonerror = 0
+zeroonexit = 0
diff --git a/debian/revpipyload.default b/debian/revpipyload.default
new file mode 100644
index 0000000..90c89b5
--- /dev/null
+++ b/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
diff --git a/doc/proginit.html b/doc/proginit.html
index 162e9f9..507669a 100644
--- a/doc/proginit.html
+++ b/doc/proginit.html
@@ -36,7 +36,7 @@ Functions
_zeroprocimg
-_zeroprocimg(self)
+_zeroprocimg()
Setzt Prozessabbild auf NULL.
diff --git a/doc/revpipyload.html b/doc/revpipyload.html
index a531907..a088624 100644
--- a/doc/revpipyload.html
+++ b/doc/revpipyload.html
@@ -32,7 +32,7 @@ begrenzt werden!
Global Attributes
-| pyloadverion |
+| pyloadversion |
Classes
diff --git a/eric-revpipyload.api b/eric-revpipyload.api
index d5c2abb..c8d612f 100644
--- a/eric-revpipyload.api
+++ b/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
diff --git a/revpipyload.e4p b/revpipyload.e4p
index b25c5a4..2c1556f 100644
--- a/revpipyload.e4p
+++ b/revpipyload.e4p
@@ -1,7 +1,7 @@
-
+
en_US
@@ -155,6 +155,14 @@
+
+ ignoreDirectories
+
+
+
+ demo
+
+
ignoreFilePatterns
@@ -263,7 +271,7 @@
ExcludeFiles
-
+ demo/*
ExcludeMessages
diff --git a/revpipyload/proginit.py b/revpipyload/proginit.py
index 0f737ab..0110be3 100644
--- a/revpipyload/proginit.py
+++ b/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):
diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py
index d60b5ad..e14b899 100755
--- a/revpipyload/revpipyload.py
+++ b/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():
diff --git a/setup.py b/setup.py
index 1d194ca..e365178 100644
--- a/setup.py
+++ b/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/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",