Merge pull request #381 from Schrolli91/new_version

prepare for version 2.4.1

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+
+
+### __[v2.4.1]__ - 23.20.2018
+##### Added
+- Pushover-Plugin: Priorität für einzelne RIC und ZVEI in config einstellbar [#378](https://github.com/Schrolli91/BOSWatch/pull/378)
+##### Changed
+- Kleinere Anpassungen im Telegram Plugin (Karten-Generierung) [#380](https://github.com/Schrolli91/BOSWatch/pull/380)
+##### Removed
+- Notify-my-Andoird Plugin und Logging-Handler wegen Einstellung des Service entfernt [#374](https://github.com/Schrolli91/BOSWatch/pull/374)
+
+
 ### __[v2.4]__ - 17.08.2018
 ##### Added
 - Config Eintrag um Port für MySQL Plugin festzulegen [#345](https://github.com/Schrolli91/BOSWatch/pull/345)
@@ -8,7 +19,7 @@
 ##### Changed
 - multicastAlarm Plugin - RICs die von multicastAlarm genutzt werden, müssen nicht mehr in der config bei allow_ric bzw. filter_range_start/filter_range_end berücksichtigt werden. [#357](https://github.com/Schrolli91/BOSWatch/pull/357)
 - FFAgent Plugin - Debug Logging für die alarmHeaders eingebaut zwecks Troubleshooting [#354](https://github.com/Schrolli91/BOSWatch/pull/354)
-- multicastAlarm Plugin - Buffer nach jedem Alarm löschen - erlaubt in kombination mit "doubleFilter_check_msg" die Verwendung in Netzen, die zwischen multicastAlarm RICs auch normale Alarme senden. #370(https://github.com/Schrolli91/BOSWatch/pull/370)
+- multicastAlarm Plugin - Buffer nach jedem Alarm löschen - erlaubt in kombination mit "doubleFilter_check_msg" die Verwendung in Netzen, die zwischen multicastAlarm RICs auch normale Alarme senden. [#370](https://github.com/Schrolli91/BOSWatch/pull/370)
 ##### Fixed
 - Fehler beim Auslesen der netIdent_RIC im MySQL Plugin [#347](https://github.com/Schrolli91/BOSWatch/pull/347)
 - FFAgent Plugin - Typo bei alarmHeaders für Live Betrieb gefixt [#354](https://github.com/Schrolli91/BOSWatch/pull/354)

README.md

@@ -1,3 +1,6 @@
+### Fast support on https://bwcc.boswatch.de (Mattermost-Server)
+#### Forum: https://boswatch.de
+
 ### Arbeiten an BOSWatch 3 gestartet
 #### Work on BOSWatch 3 has started
 ## see: https://boswatch.de/index.php?thread/29-boswatch-3/

boswatch.py

@@ -249,29 +249,6 @@
 		logging.debug("cannot set loglevel of fileHandler", exc_info=True)
 
 
-	#
-	# Add NMA logging handler
-	#
-	try:
-		if configHandler.checkConfig("NMAHandler"):
-			# is NMAHandler enabled?
-			if globalVars.config.getboolean("NMAHandler", "enableHandler") == True:
-				# we only could do something, if an APIKey is given:
-				if len(globalVars.config.get("NMAHandler","APIKey")) > 0:
-					logging.debug("add NMA logging handler")
-					from includes import NMAHandler
-					if globalVars.config.get("NMAHandler","appName") == "":
-						nmaHandler = NMAHandler.NMAHandler(globalVars.config.get("NMAHandler","APIKey"))
-					else:
-						nmaHandler = NMAHandler.NMAHandler(globalVars.config.get("NMAHandler","APIKey"), globalVars.config.get("NMAHandler","appName"))
-					nmaHandler.setLevel(globalVars.config.getint("NMAHandler","loglevel"))
-					myLogger.addHandler(nmaHandler)
-	except:
-		# It's an error, but we could work without that stuff...
-		logging.error("cannot add NMA logging handler")
-		logging.debug("cannot add NMA logging handler", exc_info=True)
-
-
 	# initialization was fine, continue with main program...
 
 	#

config/config.template.ini

@@ -64,22 +64,6 @@ doubleFilter_check_msg = 0
 writeMultimonRaw = 0
 
 
-[NMAHandler]
-# you can use a logging handler for sending logging records to NotifyMyAndroid
-# enableHandler (0|1) will enable the NMA handler
-enableHandler = 0
-
-# loglevel for NMAHandler (see BOSWatch loglevel description)
-loglevel = 50
-
-# logging record will send to APIKey
-APIKey =
-
-# you can change the name of the application (default: BOSWatch)
-# (f.e. if you use more than one instance of BOSWatch)
-appName = BOSWatch
-
-
 [FMS]
 # look-up-table for adding a description
 # using description (0 - off | 1 - on)
@@ -177,7 +161,6 @@ eMail = 0
 BosMon = 0
 firEmergency = 0
 jsonSocket = 0
-notifyMyAndroid = 0
 SMS = 0
 Sms77 = 0
 FFAgent = 0
@@ -287,23 +270,6 @@ server = 192.168.0.1
 port = 8888
 
 
-[notifyMyAndroid]
-# APIKey given from notifyMyAndroid
-APIKey =
-
-# Priority goes from -2 (lowest) to 2 (highest). The default priority is 0 (normal)
-priority = 0
-
-# You can change the name of the application (default: BOSWatch)
-# (f.e. if you use more than one instance of BOSWatch)
-appName = BOSWatch
-
-# instead of a given APIKey/priority you could import them by a csv-file (0|1)
-# APIKey and priority above will be ignored, if you use a csv
-# configuration loaded from csv/nma.csv
-usecsv = 0
-
-
 [SMS]
 # be aware that you need 'gammu' installed and running
 # at least you need an UMTS-stick which is supported by 'gammu'
@@ -383,11 +349,30 @@ SubA = 1
 SubB = 1
 SubC = 2
 SubD = -2
+
+# ...or define the priority depending on the RIC
+# 1. switch it on
+poc_spec_ric = 0
+
+# 2. fill the following lists, seperator is ,
+poc_prio2 = 
+poc_prio1 =
+poc_prio0 =
+
 poc_title = Alarm: %RIC%%LPAR%%FUNCCHAR%%RPAR%
 poc_message = %DATE% %TIME% - %DESCR%: %MSG%
 
 # Section for ZVEI
-zvei_prio = 1
+# default prio for all ZVEI - except you specify it different
+zvei_std_prio = 1 
+
+# [1 - on, 0 - off] - by switching on you can list certain ZVEI depending on their priority
+zvei_sep_prio = 0 
+
+# use the following lists, separator is ,
+zvei_prio2 = 
+zvei_prio1 = 
+zvei_prio0 = 
 zvei_title = Alarm: %ZVEI%
 zvei_message = %DATE% %TIME%: %ZVEI%
 

includes/globalVars.py

@@ -9,10 +9,9 @@
 """
 
 # version info
-versionNr = "2.4"
+versionNr = "2.4.1"
 branch = "master"
-buildDate = "17.08.2018"
-
+buildDate = "23.10.2018"
 
 # Global variables
 config = 0