Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-20 15:20:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

deepcopy of alarm data moved to processAlarm

Browse source
This commit is contained in:
f-kessler 2019-03-14 12:02:00 +01:00 committed by GitHub
parent ea68fabc12
commit b3e63afc9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/alarmHandler.py
View file

@ -37,20 +37,16 @@ def processAlarmHandler(typ, freq, data):
@return: nothing
@exception: Exception if starting a Thread failed
"""
#copy objects to avoid issues if the objects will be changed by plugin's or during asynch/threaded processing
dctyp = deepcopy(typ)
dcfreq = deepcopy(freq)
dcdata = deepcopy(data)
if globalVars.config.getboolean("BOSWatch","processAlarmAsync") == True:
logging.debug("starting processAlarm async")
try:
from threading import Thread
Thread(target=processAlarm, args=(dctyp, dcfreq, dcdata)).start()
Thread(target=processAlarm, args=(typ, freq, data)).start()
except:
logging.error("Error in starting alarm processing async")
logging.debug("Error in starting alarm processing async", exc_info=True)
else:
processAlarm(dctyp, dcfreq, dcdata)
processAlarm(typ, freq, data)
##
@ -77,15 +73,19 @@ def processAlarm(typ, freq, data):
logging.debug("[ ALARM ]")
# timestamp, to make sure, that all plugins use the same time
data['timestamp'] = int(time.time())
#copy objects to avoid issues if the objects will be changed by the plugin's during runtime or during asynch/threaded processing
dctyp = deepcopy(typ)
dcfreq = deepcopy(freq)
dcdata = deepcopy(data)
# Go to all plugins in pluginList
for pluginName, plugin in globalVars.pluginList.items():
# if enabled use RegEx-filter
if globalVars.config.getint("BOSWatch","useRegExFilter"):
from includes import regexFilter
if regexFilter.checkFilters(typ, data, pluginName, freq):
if regexFilter.checkFilters(dctyp, dcdata, pluginName, dcfreq):
logging.debug("call Plugin: %s", pluginName)
try:
plugin.run(typ, freq, data)
plugin.run(dctyp, dcfreq, dcdata)
logging.debug("return from: %s", pluginName)
except:
# call next plugin, if one has thrown an exception
@ -93,7 +93,7 @@ def processAlarm(typ, freq, data):
else: # RegEX filter off - call plugin directly
logging.debug("call Plugin: %s", pluginName)
try:
plugin.run(typ, freq, data)
plugin.run(dctyp, dcfreq, dcdata)
logging.debug("return from: %s", pluginName)
except:
# call next plugin, if one has thrown an exception