Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-04-04 22:17:24 +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

12
includes/descriptionList.py
View file

@ -94,25 +94,25 @@ def loadDescriptionLists():
#
# public function for getting a description
#
def getDescription(typ, id):
def getDescription(typ, data):
"""
Get description for id.
Will return id if no description will be found.
@return: description as string
"""
resultStr = id;
resultStr = data;
logging.debug("look up description lists")
try:
if typ == "FMS":
global fmsDescribtionList
resultStr = fmsDescribtionList[id]
resultStr = fmsDescribtionList[data]
elif typ == "ZVEI":
global zveiDescribtionList
resultStr = zveiDescribtionList[id]
resultStr = zveiDescribtionList[data]
elif typ == "POC":
global ricDescribtionList
resultStr = ricDescribtionList[id]
resultStr = ricDescribtionList[data]
else:
logging.warning("Invalid Typ: %s", typ)
@ -125,5 +125,5 @@ def getDescription(typ, id):
logging.error("Error during look up description lists")
logging.debug("Error during look up description lists", exc_info=True)
logging.debug(" - result for %s: %s", id, resultStr)
logging.debug(" - result for %s: %s", data, resultStr)
return resultStr

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"):

6
includes/helper/timeHandler.py
View file

@ -15,7 +15,7 @@ import logging
import time
def curtime(format="%d.%m.%Y %H:%M:%S", timestamp=""):
def curtime(timeStr="%d.%m.%Y %H:%M:%S", timestamp=""):
"""
Returns formated date and/or time
see: https://docs.python.org/2/library/time.html#time.strftime
@ -30,9 +30,9 @@ def curtime(format="%d.%m.%Y %H:%M:%S", timestamp=""):
"""
try:
if timestamp == "":
return time.strftime(format)
return time.strftime(timeStr)
else:
return time.strftime(format, time.localtime(timestamp))
return time.strftime(timeStr, time.localtime(timestamp))
except:
logging.warning("error in time-format-string")
logging.debug("error in time-format-string", exc_info=True)