diff --git a/includes/pluginHandler.py b/includes/alarmHandler.py similarity index 87% rename from includes/pluginHandler.py rename to includes/alarmHandler.py index b3491e1..88a1834 100644 --- a/includes/pluginHandler.py +++ b/includes/alarmHandler.py @@ -1,14 +1,14 @@ -#!/usr/bin/python -# -*- coding: cp1252 -*- - -import logging - -from includes import globals # Global variables -from includes import pluginloader - -def throwAlarm(typ,freq,data): - logging.debug("[ ALARM ]") - for name, plugin in globals.pluginList.items(): - logging.debug("call Plugin: %s", name) - plugin.run(typ,freq,data) +#!/usr/bin/python +# -*- coding: cp1252 -*- + +import logging + +from includes import globals # Global variables +from includes import pluginloader + +def processAlarm(typ,freq,data): + logging.debug("[ ALARM ]") + for name, plugin in globals.pluginList.items(): + logging.debug("call Plugin: %s", name) + plugin.run(typ,freq,data) logging.debug("[END ALARM]") \ No newline at end of file diff --git a/includes/decoder.py b/includes/decoder.py index 401b80c..6a2a0c7 100644 --- a/includes/decoder.py +++ b/includes/decoder.py @@ -33,8 +33,8 @@ def decode(freq, decoded): else: logging.info("FMS:%s Status:%s Richtung:%s TKI:%s", fms_id[0:8], fms_status, fms_direction, fms_tsi) data = {"fms":fms_id[0:8], "status":fms_status, "direction":fms_direction, "tsi":fms_tsi} - from includes import pluginHandler - pluginHandler.throwAlarm("FMS",freq,data) + from includes import alarmHandler + alarmHandler.processAlarm("FMS",freq,data) globals.fms_id_old = fms_id #save last id globals.fms_time_old = timestamp #save last time @@ -57,8 +57,8 @@ def decode(freq, decoded): else: logging.info("5-Ton: %s", zvei_id) data = {"zvei":zvei_id} - from includes import pluginHandler - pluginHandler.throwAlarm("ZVEI",freq,data) + from includes import alarmHandler + alarmHandler.processAlarm("ZVEI",freq,data) globals.zvei_id_old = zvei_id #save last id globals.zvei_time_old = timestamp #save last time diff --git a/includes/decoders/poc.py b/includes/decoders/poc.py index d78c09a..0aa9e76 100644 --- a/includes/decoders/poc.py +++ b/includes/decoders/poc.py @@ -47,8 +47,8 @@ def decode(freq, decoded): else: logging.info("POCSAG%s: %s %s %s ", bitrate, poc_id, poc_sub, poc_text) data = {"ric":poc_id, "function":poc_sub, "msg":poc_text, "bitrate":bitrate} - from includes import pluginHandler - pluginHandler.throwAlarm("POC",freq,data) + from includes import alarmHandler + alarmHandler.processAlarm("POC",freq,data) globals.poc_id_old = poc_id #save last id globals.poc_time_old = timestamp #save last time