Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-04-04 14:07:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add data['timestamp'] #72

Browse source 
to make sure, that all Plugins use the same timestamp
This commit is contained in:
JHCD 2015-07-31 19:09:27 +02:00
parent 28936d68ec
commit e7b5bffdd3
8 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
includes/alarmHandler.py
View file

@ -11,7 +11,7 @@ Handler for the filter and plugins at an alarm
"""
import logging # Global logger
from threading import Thread
import time # timestamp
from includes import globals # Global variables
@ -39,6 +39,7 @@ def processAlarmHandler(typ, freq, data):
if globals.config.getboolean("BOSWatch","processAlarmAsync") == True:
logging.debug("starting processAlarm async")
try:
from threading import Thread
Thread(target=processAlarm, args=(typ, freq, data)).start()
except:
logging.error("Error in starting alarm processing async")
@ -70,15 +71,17 @@ def processAlarm(typ, freq, data):
"""
try:
logging.debug("[ ALARM ]")
# timestamp, to make sure, that all plugins use the same time
data['timestamp'] = int(time.time())
# Go to all plugins in pluginList
for pluginName, plugin in globals.pluginList.items():
# if enabled use RegEx-filter
if globals.config.getint("BOSWatch","useRegExFilter"):
from includes import filter
if filter.checkFilters(typ,data,pluginName,freq):
if filter.checkFilters(typ, data, pluginName, freq):
logging.debug("call Plugin: %s", pluginName)
try:
plugin.run(typ,freq,data)
plugin.run(typ, freq, data)
logging.debug("return from: %s", pluginName)
except:
# call next plugin, if one has thrown an exception
@ -86,7 +89,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(typ, freq, data)
logging.debug("return from: %s", pluginName)
except:
# call next plugin, if one has thrown an exception