From 54c28a4bea58f65059c7a699cb7395caf92507ac Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 23 Sep 2016 10:24:12 +0100 Subject: [PATCH] Updated logging as logger was parsing some JSON and erroring. - Don't write whole JSON response. Safer not to anyway. No need. --- app/clients/sms/firetext.py | 12 ++---------- app/clients/sms/mmg.py | 5 ++--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/clients/sms/firetext.py b/app/clients/sms/firetext.py index 5ffb749eb..fcaf175fc 100644 --- a/app/clients/sms/firetext.py +++ b/app/clients/sms/firetext.py @@ -68,12 +68,11 @@ class FiretextClient(SmsClient): return self.name def record_outcome(self, success, response): - log_message = "API {} request {} on {} response status_code {} response text'{}'".format( + log_message = "API {} request {} on {} response status_code {}".format( "POST", "succeeded" if success else "failed", self.url, - response.status_code, - response.text + response.status_code ) if not success: @@ -83,13 +82,6 @@ class FiretextClient(SmsClient): self.current_app.logger.info(log_message) self.statsd_client.incr("clients.firetext.success") - @staticmethod - def check_response(response): - response.raise_for_status() - json.loads(response.text) - if response.json()['code'] != 0: - raise ValueError() - def send_sms(self, to, content, reference, sender=None): data = { diff --git a/app/clients/sms/mmg.py b/app/clients/sms/mmg.py index 8919b1358..fb135a9c3 100644 --- a/app/clients/sms/mmg.py +++ b/app/clients/sms/mmg.py @@ -68,12 +68,11 @@ class MMGClient(SmsClient): self.mmg_url = current_app.config.get('MMG_URL') def record_outcome(self, success, response): - log_message = "API {} request {} on {} response status_code {} response text'{}'".format( + log_message = "API {} request {} on {} response status_code {}".format( "POST", "succeeded" if success else "failed", self.mmg_url, - response.status_code, - response.text + response.status_code ) if not success: