DRY-up recording the outcome of SMS sending

This reduces the code to copy when we add a new provider. I don't
think we need to log the URL or status code each time:

- The URL is always the same.
- A "200" status code is implicit in "success".
- Other status codes will be reported as exceptions.

Removing these specific elements means "record_outcome" is generic
and can be de-duplicated in the base class.
This commit is contained in:
Ben Thorner
2022-03-24 17:33:45 +00:00
parent 35f710bdf3
commit 22e055f4d1
3 changed files with 19 additions and 39 deletions

View File

@@ -77,22 +77,6 @@ class MMGClient(SmsClient):
self.statsd_client = statsd_client
self.mmg_url = current_app.config.get('MMG_URL')
def record_outcome(self, success, response):
status_code = response.status_code if response else 503
log_message = "API {} request {} on {} response status_code {}".format(
"POST",
"succeeded" if success else "failed",
self.mmg_url,
status_code
)
if success:
self.current_app.logger.info(log_message)
self.statsd_client.incr("clients.mmg.success")
else:
self.statsd_client.incr("clients.mmg.error")
self.current_app.logger.warning(log_message)
@property
def name(self):
return 'mmg'
@@ -124,11 +108,11 @@ class MMGClient(SmsClient):
try:
json.loads(response.text)
except (ValueError, AttributeError) as e:
self.record_outcome(False, response)
self.record_outcome(False)
raise MMGClientResponseException(response=response, exception=e)
self.record_outcome(True, response)
self.record_outcome(True)
except RequestException as e:
self.record_outcome(False, e.response)
self.record_outcome(False)
raise MMGClientResponseException(response=e.response, exception=e)
finally:
elapsed_time = monotonic() - start_time