darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-19 05:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Logs time between sent_at and the provider callback into statsd

Browse Source
This commit is contained in:
Martyn Inglis
2016-09-13 13:04:44 +01:00
parent 8541f6adcd
commit 517cec173b
4 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/notifications/process_client_response.py
View File

@@ -1,4 +1,6 @@
import uuid
from datetime import datetime
from flask import current_app
from app import statsd_client
@@ -54,7 +56,8 @@ def process_sms_client_response(status, reference, client_name):
notification_success = response_dict['success']
# record stats
if not notifications_dao.update_notification_status_by_id(reference, notification_status):
notification = notifications_dao.update_notification_status_by_id(reference, notification_status)
if not notification:
status_error = "{} callback failed: notification {} either not found or already updated " \
"from sending. Status {}".format(client_name,
reference,
@@ -68,5 +71,9 @@ def process_sms_client_response(status, reference, client_name):
notification_status_message))
statsd_client.incr('callback.{}.{}'.format(client_name.lower(), notification_status))
statsd_client.timing(
'callback.{}.elapsed-time'.format(client_name.lower()),
(datetime.utcnow() - notification.sent_at)
)
success = "{} callback succeeded. reference {} updated".format(client_name, reference)
return success, errors

28
app/notifications/rest.py
View File

@@ -79,10 +79,11 @@ def process_ses_response():
try:
reference = ses_message['mail']['messageId']
if not notifications_dao.update_notification_status_by_reference(
reference,
notification_status
):
notification = notifications_dao.update_notification_status_by_reference(
reference,
notification_status
)
if not notification:
error = "SES callback failed: notification either not found or already updated " \
"from sending. Status {}".format(notification_status)
raise InvalidRequest(error, status_code=404)
@@ -96,6 +97,7 @@ def process_ses_response():
)
statsd_client.incr('callback.ses.{}'.format(notification_status))
statsd_client.timing('callback.ses.elapsed-time', (datetime.utcnow() - notification.sent_at))
return jsonify(
result="success", message="SES callback succeeded"
), 200
@@ -231,8 +233,8 @@ def send_notification(notification_type):
raise InvalidRequest(errors, status_code=400)
if (
template_object.template_type == SMS_TYPE and
template_object.replaced_content_count > current_app.config.get('SMS_CHAR_COUNT_LIMIT')
template_object.template_type == SMS_TYPE and
template_object.replaced_content_count > current_app.config.get('SMS_CHAR_COUNT_LIMIT')
):
char_count = current_app.config.get('SMS_CHAR_COUNT_LIMIT')
message = 'Content has a character count greater than the limit of {}'.format(char_count)
@@ -240,14 +242,14 @@ def send_notification(notification_type):
raise InvalidRequest(errors, status_code=400)
if all((
api_user.key_type != KEY_TYPE_TEST,
service.restricted or api_user.key_type == KEY_TYPE_TEAM,
not allowed_to_send_to(
notification['to'],
itertools.chain.from_iterable(
[user.mobile_number, user.email_address] for user in service.users
api_user.key_type != KEY_TYPE_TEST,
service.restricted or api_user.key_type == KEY_TYPE_TEAM,
not allowed_to_send_to(
notification['to'],
itertools.chain.from_iterable(
[user.mobile_number, user.email_address] for user in service.users
)
)
)
)):
if (api_user.key_type == KEY_TYPE_TEAM):
message = 'Can’t send to this recipient using a team-only API key'