From a4da59d0c258478f7b4a6bdab8eefa18073667dd Mon Sep 17 00:00:00 2001
From: JHCD <github@jhc.de>
Date: Fri, 22 May 2015 20:07:09 +0200
Subject: [PATCH] restructure BosMon-plugin

---
 plugins/BosMon/BosMon.py | 80 ++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/plugins/BosMon/BosMon.py b/plugins/BosMon/BosMon.py
index bf722f0..2c67f8f 100644
--- a/plugins/BosMon/BosMon.py
+++ b/plugins/BosMon/BosMon.py
@@ -10,6 +10,15 @@ import base64 #for the HTTP request with User/Password
 from includes import globals  # Global variables
 
 
+def bosMonRequest(httprequest, params, headers):
+	httprequest.request("POST", "/telegramin/"+globals.config.get("BosMon", "bosmon_channel")+"/input.xml", params, headers)
+	httpresponse = httprequest.getresponse()
+	if str(httpresponse.status) == "200": #Check HTTP Response an print a Log or Error
+		logging.debug("BosMon response: %s - %s", str(httpresponse.status), str(httpresponse.reason))
+	else:
+		logging.warning("BosMon response: %s - %s", str(httpresponse.status), str(httpresponse.reason))
+
+		
 def run(typ,freq,data):
 	try:
 		#ConfigParser
@@ -20,43 +29,42 @@ def run(typ,freq,data):
 		except:
 			logging.exception("cannot read config file")
 
-		########## User Plugin CODE ##########		
-		if typ == "FMS":
-			logging.warning("%s not supported", typ)
-		elif typ == "ZVEI":
-			logging.warning("%s not supported", typ)
-		elif typ == "POC":
-			logging.debug("Start POC to BosMon")
-			try:
-				#Defined data structure:
-				#   data["ric"]
-				#   data["function"]
-				#   data["msg"]
-				#BosMon-Telegramin expected "a-d" as RIC-sub/function
-				data["function"] = data["function"].replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d")
-				params = urllib.urlencode({'type':'pocsag', 'address':data["ric"], 'flags':'0', 'function':data["function"], 'message':data["msg"]})
-				logging.debug(" - Params: %s", params)
-				headers = {}
-				headers['Content-type'] = "application/x-www-form-urlencoded"
-				headers['Accept'] = "text/plain"
-				if globals.config.get("BosMon", "bosmon_user"):
-					logging.debug(" Gesicherte Verbindung ")
-					headers['Authorization'] = "Basic {0}".format(base64.b64encode("{0}:{1}".format(globals.config.get("BosMon", "bosmon_user"), globals.config.get("BosMon", "bosmon_password"))))
-				logging.debug(" Open HTTPConnection ")
-				httprequest = httplib.HTTPConnection(globals.config.get("BosMon", "bosmon_server"), globals.config.get("BosMon", "bosmon_port"))
-				logging.debug(" Start Request ")
-				httprequest.request("POST", "/telegramin/"+globals.config.get("BosMon", "bosmon_channel")+"/input.xml", params, headers)
-				logging.debug(" Get Response: ")
-				httpresponse = httprequest.getresponse()
-				if str(httpresponse.status) == "200": #Check HTTP Response an print a Log or Error
-					logging.debug("BosMon response: %s - %s", str(httpresponse.status), str(httpresponse.reason))
-				else:
-					logging.warning("BosMon response: %s - %s", str(httpresponse.status), str(httpresponse.reason))
-			except:
-				logging.error("POC to BosMon failed")
+		try:
+			#Initialize header an connect to BosMon-Server
+			headers = {}
+			headers['Content-type'] = "application/x-www-form-urlencoded"
+			headers['Accept'] = "text/plain"
+			if globals.config.get("BosMon", "bosmon_user"):
+				headers['Authorization'] = "Basic {0}".format(base64.b64encode("{0}:{1}".format(globals.config.get("BosMon", "bosmon_user"), globals.config.get("BosMon", "bosmon_password"))))
+			logging.debug("connect to BosMon")
+			httprequest = httplib.HTTPConnection(globals.config.get("BosMon", "bosmon_server"), globals.config.get("BosMon", "bosmon_port"))
+		except:
+			logging.exception("cannot connect to BosMon")
+
 		else:
-			logging.warning("Invalid Typ: %s", typ)	
-		########## User Plugin CODE ##########	
+			if typ == "FMS":
+				logging.warning("%s not supported", typ)
+
+			elif typ == "ZVEI":
+				logging.warning("%s not supported", typ)
+
+			elif typ == "POC":
+				logging.debug("Start POC to BosMon")
+				try:
+					#BosMon-Telegramin expected "a-d" as RIC-sub/function
+					data["function"] = data["function"].replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d")
+					params = urllib.urlencode({'type':'pocsag', 'address':data["ric"], 'flags':'0', 'function':data["function"], 'message':data["msg"]})
+					logging.debug(" - Params: %s", params)
+					bosMonRequest(httprequest, params, headers)
+				except:
+					logging.error("POC to BosMon failed")
+			
+			else:
+				logging.warning("Invalid Typ: %s", typ)	
+
+		finally:
+			logging.debug("close BosMon-Connection")
+			httprequest.close()
 			
 	except:
 		logging.exception("")
\ No newline at end of file