darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 17:31:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

make mmg and firetext client params consistent

Browse Source
This commit is contained in:
Leo Hemsted
2016-06-01 15:24:19 +01:00
parent a97f3bbb4f
commit 0a8cb679d7
3 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/clients/sms/mmg.py
View File

@@ -1,5 +1,4 @@
import json
from flask import current_app
from monotonic import monotonic
from requests import (request, RequestException, HTTPError)
from app.clients import (STATISTICS_DELIVERED, STATISTICS_FAILURE)
@@ -57,10 +56,11 @@ class MMGClient(SmsClient):
MMG sms client
'''
def init_app(self, config, statsd_client, *args, **kwargs):
def init_app(self, current_app, statsd_client, *args, **kwargs):
super(SmsClient, self).__init__(*args, **kwargs)
self.api_key = config.get('MMG_API_KEY')
self.from_number = config.get('MMG_FROM_NUMBER')
self.current_app = current_app
self.api_key = current_app.config.get('MMG_API_KEY')
self.from_number = current_app.config.get('MMG_FROM_NUMBER')
self.name = 'mmg'
self.statsd_client = statsd_client
@@ -84,12 +84,19 @@ class MMGClient(SmsClient):
headers={'Content-Type': 'application/json',
'Authorization': 'Basic {}'.format(self.api_key)})
if response.status_code != 200:
error = response.text
raise MMGClientException(json.loads(error))
raise MMGClientException(response.json())
response.raise_for_status()
self.current_app.logger.info(
"API {} request on {} succeeded with {} '{}'".format(
"POST",
"https://www.mmgrp.co.uk/API/json/api.php",
response.status_code,
response.json()
)
)
except RequestException as e:
api_error = HTTPError.create(e)
current_app.logger.error(
self.current_app.logger.error(
"API {} request on {} failed with {} '{}'".format(
"POST",
"https://www.mmgrp.co.uk/API/json/api.php",
@@ -102,5 +109,5 @@ class MMGClient(SmsClient):
finally:
elapsed_time = monotonic() - start_time
self.statsd_client.timing("notifications.clients.mmg.request-time", elapsed_time)
current_app.logger.info("MMG request finished in {}".format(elapsed_time))
self.current_app.logger.info("MMG request finished in {}".format(elapsed_time))
return response