revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2025-11-08 23:23:52 +01:00
Code Issues Packages Releases Wiki Activity

fehler in logrotate script

Browse Source
This commit is contained in:
Sven Sager
2017-03-28 10:07:46 +02:00
parent 7c08751c8a
commit 7e68d2763b
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/revpipyload.logrotate vendored
View File

@@ -7,7 +7,8 @@
delaycompress delaycompress
missingok missingok
notifempty notifempty
sharedscripts
postrotate postrotate
kill -SIGUSR1 `cat /var/run/revpipyload.pid` > /dev/null 2>&1 || true /bin/kill -s USR1 `cat /var/run/revpipyload.pid` > /dev/null 2>&1 || true
endscript endscript
} }

4
revpipyload.e4p
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
<!-- eric project file for project revpipyload --> <!-- eric project file for project revpipyload -->
<!-- Saved: 2017-03-22, 12:24:46 --> <!-- Saved: 2017-03-28, 10:07:15 -->
<!-- Copyright (C) 2017 Sven Sager, akira@narux.de --> <!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
<Project version="5.1"> <Project version="5.1">
<Language>en_US</Language> <Language>en_US</Language>
@@ -9,7 +9,7 @@
<ProgLanguage mixed="0">Python3</ProgLanguage> <ProgLanguage mixed="0">Python3</ProgLanguage>
<ProjectType>Console</ProjectType> <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> <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.2.10</Version> <Version>0.2.11</Version>
<Author>Sven Sager</Author> <Author>Sven Sager</Author>
<Email>akira@narux.de</Email> <Email>akira@narux.de</Email>
<Eol index="-1"/> <Eol index="-1"/>

8
revpipyload/revpipyload.py
View File

@@ -53,7 +53,7 @@ from xmlrpc.server import SimpleXMLRPCServer
configrsc = "/opt/KUNBUS/config.rsc" configrsc = "/opt/KUNBUS/config.rsc"
picontrolreset = "/opt/KUNBUS/piControlReset" picontrolreset = "/opt/KUNBUS/piControlReset"
procimg = "/dev/piControl0" procimg = "/dev/piControl0"
pyloadverion = "0.2.10" pyloadverion = "0.2.11"
class LogReader(): class LogReader():
@@ -534,7 +534,7 @@ class RevPiPyLoad():
int(self.globalconfig["DEFAULT"].get("pythonversion", 3)) int(self.globalconfig["DEFAULT"].get("pythonversion", 3))
self.xmlrpc = \ self.xmlrpc = \
int(self.globalconfig["DEFAULT"].get("xmlrpc", 0)) int(self.globalconfig["DEFAULT"].get("xmlrpc", 0))
self.zerooneerror = \ self.zeroonerror = \
int(self.globalconfig["DEFAULT"].get("zeroonerror", 1)) int(self.globalconfig["DEFAULT"].get("zeroonerror", 1))
self.zeroonexit = \ self.zeroonexit = \
int(self.globalconfig["DEFAULT"].get("zeroonexit", 1)) int(self.globalconfig["DEFAULT"].get("zeroonexit", 1))
@@ -623,7 +623,7 @@ class RevPiPyLoad():
th_plc.autoreload = self.autoreload th_plc.autoreload = self.autoreload
th_plc.gid = int(self.globalconfig["DEFAULT"].get("plcgid", 65534)) th_plc.gid = int(self.globalconfig["DEFAULT"].get("plcgid", 65534))
th_plc.uid = int(self.globalconfig["DEFAULT"].get("plcuid", 65534)) th_plc.uid = int(self.globalconfig["DEFAULT"].get("plcuid", 65534))
th_plc.zeroonerror = self.zerooneerror th_plc.zeroonerror = self.zeroonerror
th_plc.zeroonexit = self.zeroonexit th_plc.zeroonexit = self.zeroonexit
proginit.logger.debug("created PLC watcher") proginit.logger.debug("created PLC watcher")
return th_plc return th_plc
@@ -757,7 +757,7 @@ class RevPiPyLoad():
dc["xmlrpc"] = self.xmlrpc dc["xmlrpc"] = self.xmlrpc
dc["xmlrpcport"] = \ dc["xmlrpcport"] = \
self.globalconfig["DEFAULT"].get("xmlrpcport", 55123) self.globalconfig["DEFAULT"].get("xmlrpcport", 55123)
dc["zeroonerror"] = self.zerooneerror dc["zeroonerror"] = self.zeroonerror
dc["zeroonexit"] = self.zeroonexit dc["zeroonexit"] = self.zeroonexit
return dc return dc

2
setup.py
View File

@@ -27,7 +27,7 @@ setup(
license="LGPLv3", license="LGPLv3",
name="revpipyload", name="revpipyload",
version="0.2.10", version="0.2.11",
scripts=["data/revpipyload"], scripts=["data/revpipyload"],