changed httprequest plugin

This commit is contained in:
Jan-Hendrik Plogmann 2016-10-01 19:51:20 +02:00
parent 6c2ec0c4df
commit 0df55885d9
2 changed files with 21 additions and 38 deletions

View file

@ -154,7 +154,7 @@ signal_ric = ## SIGNAL-RICS ##
[httpRequest]
# URL without http://
# example URL http://example.com/remote.php?DESCR=%DESCR%
# you can use the following wildcards in your URL as GET params:
# http://en.wikipedia.org/wiki/Query_string
@ -167,14 +167,14 @@ signal_ric = ## SIGNAL-RICS ##
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#fms_url = www.google.de?code=%FMS%&stat=%STATUS%
#fms_url = http://www.google.de?code=%FMS%&stat=%STATUS%
fms_url =
# %ZVEI% = ZVEI 5-tone Code
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#zvei_url = www.google.de?zvei=%ZVEI%
#zvei_url = http://www.google.de?zvei=%ZVEI%
zvei_url =
# %RIC% = Pocsag RIC
@ -185,7 +185,7 @@ zvei_url =
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#poc_url = www.google.de?ric=%RIC%&subric=%FUNC%&msg=%MSG%
#poc_url = http://www.google.de?ric=%RIC%&subric=%FUNC%&msg=%MSG%
poc_url =

View file

@ -1,21 +1,29 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
# -*- coding: cp1252 -*-
"""
httpRequest-Plugin to dispatch FMS-, ZVEI- and POCSAG - messages to an URL
@author: Bastian Schroll
@author: TheJockel
@requires: httpRequest-Configuration has to be set in the config.ini
"""
#
# Imports
#
#import httplib #for the HTTP request
import urllib2
import urllib
import time
import logging # Global logger
import httplib #for the HTTP request
from urlparse import urlparse #for split the URL into url and path
import string
from includes import globals # Global variables
# Helper function, uncomment to use
#from includes.helper import timeHandler
from includes.helper import wildcardHandler
from includes.helper import configHandler
@ -68,13 +76,15 @@ def run(typ,freq,data):
if typ == "FMS":
url = globals.config.get("httpRequest", "fms_url") #Get URL
url = wildcardHandler.replaceWildcards(url, data) # replace wildcards with helper function
url = url.replace(" ","%20") # replace space with %20 to be a vaild http request
elif typ == "ZVEI":
url = globals.config.get("httpRequest", "zvei_url") #Get URL
url = wildcardHandler.replaceWildcards(url, data) # replace wildcards with helper function
url = url.replace(" ","%20") # replace space with %20 to be a vaild http request
elif typ == "POC":
url = globals.config.get("httpRequest", "poc_url") #Get URL
url = wildcardHandler.replaceWildcards(url, data) # replace wildcards with helper function
url = url.replace(" ","%20") # replace space with %20 to be a vaild http request
else:
logging.warning("Invalid Typ: %s", typ)
return
@ -84,37 +94,10 @@ def run(typ,freq,data):
# HTTP-Request
#
logging.debug("send %s HTTP request", typ)
url = urlparse(url) #split URL into path and querry
httprequest = httplib.HTTPConnection(url[2]) #connect to URL Path
httprequest.request("GET", url[5]) #send URL Querry per GET
urllib2.urlopen(url)
except:
logging.error("cannot send HTTP request")
logging.debug("cannot send HTTP request", exc_info=True)
return
else:
try:
#
# check HTTP-Response
#
httpresponse = httprequest.getresponse()
if str(httpresponse.status) == "200": #Check HTTP Response an print a Log or Error
logging.debug("HTTP response: %s - %s" , str(httpresponse.status), str(httpresponse.reason))
else:
logging.warning("HTTP response: %s - %s" , str(httpresponse.status), str(httpresponse.reason))
except: #otherwise
logging.error("cannot get HTTP response")
logging.debug("cannot get HTTP response", exc_info=True)
return
finally:
logging.debug("close HTTP-Connection")
try:
httprequest.close()
except:
pass
except:
logging.error("unknown error")
logging.debug("unknown error", exc_info=True)