Update FFAgent.py

Added a OrderedDict to keep the Content-Type first in a URL Request to prevent HTTP 500 Errors from the FF-Agent API.
This commit is contained in:
CJHarms 2019-08-01 22:20:35 +02:00
parent 65dd9b495d
commit f4c35391b4

View file

@ -12,6 +12,7 @@ FFAgent-Plugin to send FMS-, ZVEI- and POCSAG - messages to FF-Agent
import logging # Global logger
import hmac, hashlib
import json, requests
import collections
from includes import globalVars # Global variables
@ -134,6 +135,15 @@ def run(typ,freq,data):
}
logging.debug(alarmHeaders)
alarmHeaders = collections.OrderedDict(alarmHeaders)
alarmHeadersOrdered = collections.OrderedDict()
alarmHeadersOrdered["Content-Type"]=alarmHeaders["Content-Type"]
alarmHeadersOrdered["webApiToken"]=alarmHeaders["webApiToken"]
alarmHeadersOrdered["accessToken"]=alarmHeaders["accessToken"]
alarmHeadersOrdered["selectiveCallCode"]=alarmHeaders["selectiveCallCode"]
alarmHeadersOrdered["hmac"]=alarmHeaders["hmac"]
logging.debug(alarmHeadersOrdered)
if globalVars.config.get("FFAgent", "live") == "1":
r = requests.post(url, data=alarmData, headers=alarmHeaders, verify=serverCertFile, cert=(clientCertFile, clientCertPass))
else: