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

signal für neue LogFiles erstellt. FileHandler werden umgehängt

Browse Source 
logrotate ruft signal SIGUSR1 auf
Ausgaben des Python PLC Programms über eine PIPE führen um diese in neuen
Loghandler zu schreiben
proginit als globales Modul umgebaut (kein Vererbung mehr)
This commit is contained in:
Sven Sager
2017-03-21 18:14:05 +01:00
parent 88ee0e4eae
commit b3c7544daa
7 changed files with 976 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
revpipyload/proginit.py
View File

@@ -1,108 +1,121 @@
#
# RevPiPyLoad
#
# Webpage: https://revpimodio.org/revpipyplc/
# (c) Sven Sager, License: LGPLv3
#
# -*- coding: utf-8 -*-
"""Main functions of our program."""
import logging
import sys
from argparse import ArgumentParser
from configparser import ConfigParser
from os import fork as osfork
from os.path import exists as ospexists
forked = False
globalconffile = None
logapp = "revpipyloadapp.log"
logplc = "revpipyload.log"
logger = None
pargs = None
class ProgInit():
def cleanup():
"""Clean up program."""
# Logging beenden
logging.shutdown()
"""Programmfunktionen fuer Parameter und Logger."""
def __del__(self):
"""Clean up program."""
# Logging beenden
logging.shutdown()
def configure():
"""Initialize general program functions."""
def __init__(self):
"""Initialize general program functions."""
# Command arguments
parser = ArgumentParser(
description="RevolutionPi Python3 Loader"
)
parser.add_argument(
"-d", "--daemon", action="store_true", dest="daemon",
help="Run program as a daemon in background"
)
parser.add_argument(
"-c", "--conffile", dest="conffile",
default="revpipyload.conf",
help="Application configuration file"
)
parser.add_argument(
"-f", "--logfile", dest="logfile",
help="Save log entries to this file"
)
parser.add_argument(
"-v", "--verbose", action="count", dest="verbose",
help="Switch on verbose logging"
)
global pargs
pargs = parser.parse_args()
# Command arguments
parser = ArgumentParser(
description="RevolutionPi Python3 Loader"
)
parser.add_argument(
"-d", "--daemon", action="store_true", dest="daemon",
help="Run program as a daemon in background"
)
parser.add_argument(
"-c", "--conffile", dest="conffile",
default="revpipyload.conf",
help="Application configuration file"
)
parser.add_argument(
"-f", "--logfile", dest="logfile",
help="Save log entries to this file"
)
parser.add_argument(
"-v", "--verbose", action="count", dest="verbose",
help="Switch on verbose logging"
)
global pargs
pargs = parser.parse_args()
# Prüfen ob als Daemon ausgeführt werden soll
global forked
pidfile = "/var/run/revpipyload.pid"
pid = 0
if pargs.daemon and not forked:
# Prüfen ob daemon schon läuft
if ospexists(pidfile):
raise SystemError(
"program already running as daemon. check {}".format(pidfile)
)
# Prüfen ob als Daemon ausgeführt werden soll
self.pidfile = "/var/run/revpipyload.pid"
self.pid = 0
if pargs.daemon:
# Prüfen ob daemon schon läuft
if ospexists(self.pidfile):
raise SystemError(
"program already running as daemon. check {}".format(
self.pidfile
)
)
# Zum daemon machen
pid = osfork()
if pid > 0:
with open(pidfile, "w") as f:
f.write(str(pid))
sys.exit(0)
else:
forked = True
self.pid = osfork()
if self.pid > 0:
with open(self.pidfile, "w") as f:
f.write(str(self.pid))
sys.exit(0)
if pargs.daemon:
global logapp
global logplc
global logapp
global logplc
# Ausgaben umhängen in Logfile
logapp = "/var/log/revpipyloadapp"
logplc = "/var/log/revpipyload"
pargs.conffile = "/etc/revpipyload/revpipyload.conf"
sys.stdout = open(logplc, "a")
sys.stderr = sys.stdout
# Ausgaben umhängen in Logfile
logapp = "/var/log/revpipyloadapp"
logplc = "/var/log/revpipyload"
pargs.conffile = "/etc/revpipyload/revpipyload.conf"
sys.stdout = open(logplc, "a")
sys.stderr = sys.stdout
# Initialize configparser globalconfig
global globalconffile
globalconffile = pargs.conffile
# Initialize configparser globalconfig
self.globalconffile = pargs.conffile
self.globalconfig = ConfigParser()
self.globalconfig.read(pargs.conffile)
# Program logger
global logger
logger = logging.getLogger()
# Program logger
global logger
logger = logging.getLogger()
logformat = logging.Formatter(
"{asctime} [{levelname:8}] {message}",
datefmt="%Y-%m-%d %H:%M:%S", style="{"
)
lhandler = logging.StreamHandler(sys.stdout)
# Alle handler entfernen
for lhandler in logger.handlers:
logger.removeHandler(lhandler)
# Neue Handler bauen
logformat = logging.Formatter(
"{asctime} [{levelname:8}] {message}",
datefmt="%Y-%m-%d %H:%M:%S", style="{"
)
lhandler = logging.StreamHandler(sys.stdout)
lhandler.setFormatter(logformat)
logger.addHandler(lhandler)
if pargs.logfile is not None:
lhandler = logging.FileHandler(filename=pargs.logfile)
lhandler.setFormatter(logformat)
logger.addHandler(lhandler)
if pargs.logfile is not None:
lhandler = logging.FileHandler(filename=pargs.logfile)
lhandler.setFormatter(logformat)
logger.addHandler(lhandler)
# Loglevel auswerten
if pargs.verbose is None:
loglevel = logging.WARNING
elif pargs.verbose == 1:
loglevel = logging.INFO
elif pargs.verbose > 1:
loglevel = logging.DEBUG
logger.setLevel(loglevel)
# Loglevel auswerten
if pargs.verbose is None:
loglevel = logging.WARNING
elif pargs.verbose == 1:
loglevel = logging.INFO
elif pargs.verbose > 1:
loglevel = logging.DEBUG
logger.setLevel(loglevel)

156
revpipyload/revpipyload.py
View File

@@ -39,6 +39,7 @@ import subprocess
import tarfile
import zipfile
from concurrent import futures
from configparser import ConfigParser
from json import loads as jloads
from re import match as rematch
from shutil import rmtree
@@ -51,7 +52,7 @@ from xmlrpc.server import SimpleXMLRPCServer
configrsc = "/opt/KUNBUS/config.rsc"
picontrolreset = "/opt/KUNBUS/piControlReset"
procimg = "/dev/piControl0"
pyloadverion = "0.2.9"
pyloadverion = "0.2.10"
class LogReader():
@@ -72,6 +73,13 @@ class LogReader():
self.fhplc = None
self.posplc = 0
def closeall(self):
"""Fuehrt close auf File Handler durch."""
if self.fhapp is not None:
self.fhapp.close()
if self.fhplc is not None:
self.fhplc.close()
def get_applines(self):
"""Gibt neue Zeilen ab letzen Aufruf zurueck.
@returns: list() mit neuen Zeilen"""
@@ -152,6 +160,39 @@ class LogReader():
return self.fhplc.read()
class PipeLogwriter(Thread):
def __init__(self, fh):
super().__init__()
self._exit = Event()
self.fh = fh
if fh is None:
self.pipeout = None
else:
self._pipein, self.pipeout = os.pipe()
def run(self):
if self.fh is not None:
fhread = os.fdopen(self._pipein)
proginit.logger.debug("enter logreader pipe")
while not self._exit.is_set():
line = fhread.readline()
try:
self.fh.write(line)
self.fh.flush()
except:
pass
proginit.logger.debug("leave logreader pipe")
def stop(self):
proginit.logger.debug("quit pipe logreader")
self._exit.set()
if self.pipeout is not None:
os.write(self.pipeout, b"\n")
os.close(self.pipeout)
os.close(self._pipein)
class RevPiPlc(Thread):
"""Verwaltet das PLC Python Programm.
@@ -170,8 +211,9 @@ class RevPiPlc(Thread):
self._arguments = arguments
self._evt_exit = Event()
self.exitcode = None
self._fh = None
self._fh = self._configurefh()
self.gid = 65534
self.plw = None
self._program = program
self._procplc = None
self._pversion = pversion
@@ -179,21 +221,39 @@ class RevPiPlc(Thread):
self.zeroonerror = False
self.zeroonexit = False
def _configurefh(self):
# Ausgaben konfigurieren und ggf. umleiten
proginit.logger.debug("configure fh applog")
logfile = None
if proginit.pargs.daemon:
if os.access(os.path.dirname(proginit.logapp), os.R_OK | os.W_OK):
logfile = proginit.logapp
elif proginit.pargs.logfile is not None:
logfile = proginit.pargs.logfile
if logfile is not None:
return open(logfile, "a")
else:
return None
def _setuppopen(self):
"""Setzt UID und GID fuer das PLC Programm."""
proginit.logger.debug(
"set uid {} and gid {}".format(self.uid, self.gid))
os.setgid(self.gid)
os.setuid(self.uid)
def _spopen(self, lst_proc):
def _spopen(self, lst_proc, filenum=None):
"""Startet das PLC Programm.
@param lst_proc: Prozessliste
@returns: subprocess"""
proginit.logger.debug("configure subprocess")
return subprocess.Popen(
lst_proc,
preexec_fn=self._setuppopen,
cwd=os.path.dirname(self._program),
bufsize=1,
stdout=subprocess.STDOUT if self._fh is None else self._fh,
stdout=subprocess.STDOUT if filenum is None else filenum,
stderr=subprocess.STDOUT
)
@@ -203,6 +263,20 @@ class RevPiPlc(Thread):
f = open("/dev/piControl0", "w+b", 0)
f.write(bytes(4096))
def newlogfile(self):
if self._fh is not None:
self._fh.close()
self._fh = self._configurefh()
if self.plw is not None:
self.plw.fh = self._fh
self._fh.write("-" * 55)
self._fh.write("\nstart new logfile: {}\n".format(asctime()))
self._fh.flush()
proginit.logger.info("new plc logfile")
def run(self):
"""Fuehrt PLC-Programm aus und ueberwacht es."""
if self._pversion == 2:
@@ -214,25 +288,21 @@ class RevPiPlc(Thread):
self._program, self._arguments
))
# Ausgaben konfigurieren und ggf. umleiten
logfile = None
if proginit.pargs.daemon:
if os.access(os.path.dirname(proginit.logapp), os.R_OK | os.W_OK):
logfile = proginit.logapp
elif proginit.pargs.logfile is not None:
logfile = proginit.pargs.logfile
if logfile is not None:
self._fh = open(logfile, "a")
# Logausgabe
if self._fh is not None:
self._fh.write("-" * 55)
self._fh.write("\nplc: {} started: {}\n".format(
os.path.basename(self._program), asctime()
))
self._fh.flush()
# LogWriter
self.plw = PipeLogwriter(self._fh)
self.plw.start()
# Prozess erstellen
proginit.logger.info("start plc program {}".format(self._program))
self._procplc = self._spopen(lst_proc)
self._procplc = self._spopen(lst_proc, self.plw.pipeout)
while not self._evt_exit.is_set():
@@ -263,7 +333,7 @@ class RevPiPlc(Thread):
if not self._evt_exit.is_set() and self.autoreload:
# Prozess neu starten
self._procplc = self._spopen(lst_proc)
self._procplc = self._spopen(lst_proc, self.plw.pipeout)
if self.exitcode == 0:
proginit.logger.warning(
"restart plc program after clean exit"
@@ -277,8 +347,15 @@ class RevPiPlc(Thread):
self._evt_exit.wait(1)
def stop(self):
"""Beendet PLC-Programm."""
proginit.logger.info("stop revpiplc thread")
self._evt_exit.set()
# Prüfen ob es einen subprocess gibt
if self._procplc is None:
if self.plw is not None:
self.plw.stop()
return
# Prozess beenden
@@ -305,12 +382,11 @@ class RevPiPlc(Thread):
or self.zeroonerror and self.exitcode != 0:
self._zeroprocimg()
def stop(self):
"""Beendet PLC-Programm."""
self._evt_exit.set()
if self.plw is not None:
self.plw.stop()
class RevPiPyLoad(proginit.ProgInit):
class RevPiPyLoad():
"""Hauptklasse, die alle Funktionen zur Verfuegung stellt.
@@ -321,10 +397,11 @@ class RevPiPyLoad(proginit.ProgInit):
def __init__(self):
"""Instantiiert RevPiPyLoad-Klasse."""
super().__init__()
proginit.configure()
self._exit = True
self.evt_loadconfig = Event()
self.globalconfig = ConfigParser()
self.logr = LogReader()
self.plc = None
self.tfile = {}
@@ -338,6 +415,7 @@ class RevPiPyLoad(proginit.ProgInit):
signal.signal(signal.SIGINT, self._sigexit)
signal.signal(signal.SIGTERM, self._sigexit)
signal.signal(signal.SIGHUP, self._sigloadconfig)
signal.signal(signal.SIGUSR1, self._signewlogfile)
def _loadconfig(self):
"""Load configuration file and setup modul."""
@@ -353,9 +431,9 @@ class RevPiPyLoad(proginit.ProgInit):
# Konfigurationsdatei laden
proginit.logger.info(
"loading config file: {}".format(self.globalconffile)
"loading config file: {}".format(proginit.globalconffile)
)
self.globalconfig.read(self.globalconffile)
self.globalconfig.read(proginit.globalconffile)
# Konfiguration verarbeiten
self.autoreload = \
@@ -473,11 +551,29 @@ class RevPiPyLoad(proginit.ProgInit):
proginit.logger.debug("got exit signal")
self.stop()
# Programm aufräumen
proginit.cleanup()
def _sigloadconfig(self, signum, frame):
"""Signal handler to load configuration."""
proginit.logger.debug("got reload config signal")
self.evt_loadconfig.set()
def _signewlogfile(self, signum, frame):
"""Signal handler to start new logfile."""
proginit.logger.debug("got new logfile signal")
# Logger neu konfigurieren
proginit.configure()
proginit.logger.info("start new logfile: {}".format(asctime()))
# stdout für revpipyplc
if self.plc is not None:
self.plc.newlogfile()
# Logreader schließen
self.logr.closeall()
def packapp(self, mode="tar", pictory=False):
"""Erzeugt aus dem PLC-Programm ein TAR-File.
@@ -673,9 +769,13 @@ class RevPiPyLoad(proginit.ProgInit):
def xml_plcstop(self):
"""Stoppt das PLC Programm.
@returns: int() Exitcode vom PLC Programm"""
@returns: int() Exitcode vom PLC Programm
-1 PLC Programm lief nicht
"""
proginit.logger.debug("xmlrpc call plcstop")
if self.plc is not None:
if self.plc is not None and self.plc.is_alive():
self.plc.stop()
self.plc.join()
return self.plc.exitcode
@@ -760,10 +860,10 @@ class RevPiPyLoad(proginit.ProgInit):
self.globalconfig.set("DEFAULT", key, str(dc[key]))
# conf-Datei schreiben
fh = open(self.globalconffile, "w")
fh = open(proginit.globalconffile, "w")
self.globalconfig.write(fh)
proginit.logger.info(
"got new config and wrote it to {}".format(self.globalconffile)
"got new config and wrote it to {}".format(proginit.globalconffile)
)
if loadnow: