Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-04-11 01:13:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

resolve some Code Style Problems

Browse source
This commit is contained in:
Bastian Schroll 2016-11-20 13:05:24 +01:00
parent 1877c7f367
commit e3b3377f9e
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
includes/doubleFilter.py
View file

@ -17,12 +17,12 @@ import time # timestamp for doublealarm
from includes import globalVars # Global variables
#
# ListStructure [0..n] = (ID, TimeStamp, msg)
# ListStructure [0..n] = (Data, TimeStamp, msg)
#
doubleList = []
def checkID(typ, id, msg=""):
def checkID(typ, data, msg=""):
"""
check if id was called in the last x sec and n entries
@ -34,12 +34,12 @@ def checkID(typ, id, msg=""):
global doubleList
timestamp = int(time.time()) # Get Timestamp
logging.debug("checkID: %s (%s)", id, msg)
logging.debug("checkID: %s (%s)", data, msg)
for i in range(len(doubleList)):
(xID, xTimestamp, xMsg) = doubleList[i]
# given ID found?
# return False if the first entry in double_ignore_time is found, we will not check for younger ones...
if id == xID and timestamp < xTimestamp + globalVars.config.getint("BOSWatch", "doubleFilter_ignore_time"):
if data == xID and timestamp < xTimestamp + globalVars.config.getint("BOSWatch", "doubleFilter_ignore_time"):
logging.debug("-- previous id %s is within doubleFilter_ignore_time (%ss)", xID, globalVars.config.getint("BOSWatch", "doubleFilter_ignore_time"))
# if wanted, we have to check the msg additional
if "POC" in typ and globalVars.config.getint("BOSWatch", "doubleFilter_check_msg"):
@ -56,7 +56,7 @@ def checkID(typ, id, msg=""):
return True
def newEntry(id, msg = ""):
def newEntry(data, msg = ""):
"""
new entry in double alarm list
@ -64,9 +64,9 @@ def newEntry(id, msg = ""):
"""
global doubleList
timestamp = int(time.time()) # Get Timestamp
doubleList.append((id, timestamp, msg.strip()))
doubleList.append((data, timestamp, msg.strip()))
logging.debug("Added %s to doubleList", id)
logging.debug("Added %s to doubleList", data)
# now check if list has more than n entries:
if len(doubleList) > globalVars.config.getint("BOSWatch", "doubleFilter_ignore_entries"):