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

fix space errors

Browse source
This commit is contained in:
Julian Wöhrer 2022-01-02 01:01:09 +01:00
parent 8008c5ff9f
commit b71db2b094
4 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/FFAgent/FFAgent.py
View file

@ -138,11 +138,11 @@ def run(typ,freq,data):
logging.debug(alarmHeaders)
alarmHeadersOrdered=OrderedDict()
alarmHeadersOrdered['webApiToken']=webApiToken
alarmHeadersOrdered['accessToken']=accessToken
alarmHeadersOrdered['selectiveCallCode']=selectiveCallCode
alarmHeadersOrdered['hmac']=hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest()
alarmHeadersOrdered=OrderedDict()
alarmHeadersOrdered['webApiToken']=webApiToken
alarmHeadersOrdered['accessToken']=accessToken
alarmHeadersOrdered['selectiveCallCode']=selectiveCallCode
alarmHeadersOrdered['hmac']=hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest()
logging.debug(alarmHeadersOrdered)

56
plugins/Pushover/Pushover.py
View file

@ -76,16 +76,16 @@ def run(typ, freq, data):
# building message for ZVEI
#
if globalVars.config.get("Pushover", "zvei_sep_prio") == '1':
if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"):
priority = '2'
elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"):
priority = '1'
elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"):
priority = '0'
else:
priority = '-1'
else:
priority = globalVars.config.get("Pushover","zvei_std_prio")
if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"):
priority = '2'
elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"):
priority = '1'
elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"):
priority = '0'
else:
priority = '-1'
else:
priority = globalVars.config.get("Pushover","zvei_std_prio")
message = globalVars.config.get("Pushover", "zvei_message")
title = globalVars.config.get("Pushover", "zvei_title")
@ -98,25 +98,25 @@ def run(typ, freq, data):
#
logging.debug("send Pushover for %s", typ)
if globalVars.config.get("Pushover", "poc_spec_ric") == '0':
if data["function"] == '1':
priority = globalVars.config.get("Pushover", "SubA")
elif data["function"] == '2':
priority = globalVars.config.get("Pushover", "SubB")
elif data["function"] == '3':
priority = globalVars.config.get("Pushover", "SubC")
elif data["function"] == '4':
priority = globalVars.config.get("Pushover", "SubD")
else:
priority = 0
if data["function"] == '1':
priority = globalVars.config.get("Pushover", "SubA")
elif data["function"] == '2':
priority = globalVars.config.get("Pushover", "SubB")
elif data["function"] == '3':
priority = globalVars.config.get("Pushover", "SubC")
elif data["function"] == '4':
priority = globalVars.config.get("Pushover", "SubD")
else:
priority = 0
else:
if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"):
priority = 2
elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"):
priority = 1
elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"):
priority = 0
else:
priority = -1
if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"):
priority = 2
elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"):
priority = 1
elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"):
priority = 0
else:
priority = -1
message = globalVars.config.get("Pushover", "poc_message")
title = globalVars.config.get("Pushover", "poc_title")

2
plugins/gpiocontrol/gpiocontrol.py
View file

@ -112,7 +112,7 @@ def trigger():
GPIO.output(GPIOPIN, GPIO.LOW)
logging.info("GPIOPIN %s angeschaltet", GPIOPIN)
time.sleep(waitTime)
GPIO.output(GPIOPIN, GPIO.HIGH)
GPIO.output(GPIOPIN, GPIO.HIGH)
logging.info("GPIOPIN %s ausgeschaltet", GPIOPIN)
return

4
plugins/httpRequest/httpRequest.py
View file

@ -102,9 +102,9 @@ def run(typ,freq,data):
try:
urllib.request.urlopen(url)
except urllib.error.HTTPError as e:
logging.warning("HTTP response: %s", e.code)
logging.warning("HTTP response: %s", e.code)
except urllib.error.URLError as e:
logging.warning("HTTP-specific error: %s", e.args)
logging.warning("HTTP-specific error: %s", e.args)
except:
logging.error("cannot send HTTP request")