Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2025-12-06 07:42:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add vehicle / ric to Divera Plugin

Browse source
This commit is contained in:
Lars Gremme 2020-04-29 19:50:45 +02:00
parent 6580d385f8
commit 572c40d1a4
2 changed files with 48 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/config.template.ini
View file

@ -494,17 +494,20 @@ SubD =
poc_title = %DESCR%: %MSG%
poc_text = %DATE% %TIME% - %DESCR%: %MSG%
poc_ric = %DESCR%
# Section for ZVEI
# default prio for all ZVEI - except you specify it different
zvei_prio = true
zvei_title = Alarm: %ZVEI%
zvei_text = %DATE% %TIME%: %ZVEI%
zvei_ric = %DESCR%
# Section for FMS
fms_prio = true
fms_title = FMS: %FMS%
fms_text = %DATE% %TIME%: %FMS%%BR%Status: %STATUS% - Direction: %DIRT% - TSI: %TSI% %LPAR%%DESCR%%RPAR%
fms_vehicle = %DESCR%
[gpiocontrol]

54
plugins/Divera/Divera.py
View file

@ -61,6 +61,7 @@ def run(typ, freq, data):
text = globalVars.config.get("Divera", "fms_text")
title = globalVars.config.get("Divera", "fms_title")
priority = globalVars.config.get("Divera", "fms_prio")
vehicle = globalVars.config.get("Divera", "fms_vehicle")
elif typ == "ZVEI":
#
@ -69,6 +70,7 @@ def run(typ, freq, data):
text = globalVars.config.get("Divera", "zvei_text")
title = globalVars.config.get("Divera", "zvei_title")
priority = globalVars.config.get("Divera","zvei_std_prio")
ric = globalVars.config.get("Divera","zvei_ric")
elif typ == "POC":
#
@ -87,6 +89,7 @@ def run(typ, freq, data):
text = globalVars.config.get("Divera", "poc_text")
title = globalVars.config.get("Divera", "poc_title")
ric = globalVars.config.get("Divera", "poc_ric")
else:
logging.warning("Invalid type: %s", typ)
@ -101,9 +104,18 @@ def run(typ, freq, data):
# replace the wildcards
text = wildcardHandler.replaceWildcards(text, data)
title = wildcardHandler.replaceWildcards(title, data)
if typ == "FMS":
vehicle = wildcardHandler.replaceWildcards(vehicle, data)
else:
ric = wildcardHandler.replaceWildcards(ric, data)
# Logging data to send
logging.debug("Title : %s", title)
if typ == "FMS":
logging.debug("Vehicle : %s", vehicle)
else:
logging.debug("RIC : %s", ric)
logging.debug("Text : %s", text)
logging.debug("Priority: %s", priority)
@ -112,15 +124,39 @@ def run(typ, freq, data):
logging.info("No Priority set for type '%s'! Skipping Divera-Alarm!", typ)
return
# start the connection
conn = httplib.HTTPSConnection("www.divera247.com:443")
conn.request("GET", "/api/alarm",
urllib.urlencode({
"accesskey": globalVars.config.get("Divera", "accesskey"),
"title": title,
"text": text,
"priority": priority,
}))
# Check FMS
if typ == "FMS":
if (vehicle == ''):
logging.info("No Vehicle set!");
else:
if (ric == ''):
logging.info("No RIC set!");
# start connection to Divera
if typ == "FMS":
# start the connection FMS
conn = httplib.HTTPSConnection("www.divera247.com:443")
conn.request("GET", "/api/fms",
urllib.urlencode({
"accesskey": globalVars.config.get("Divera", "accesskey"),
"vehicle_ric": vehicle,
"title": title,
"text": text,
"priority": priority,
}))
else:
# start connection ZVEI / POC
conn = httplib.HTTPSConnection("www.divera247.com:443")
conn.request("GET", "/api/alarm",
urllib.urlencode({
"accesskey": globalVars.config.get("Divera", "accesskey"),
"title": title,
"ric": ric,
"text": text,
"priority": priority,
}))
except:
logging.error("cannot send Divera request")