WIP - adding request timeout

This commit is contained in:
Martyn Inglis
2017-04-04 16:05:25 +01:00
parent 734772c1eb
commit 57bd6494e1
4 changed files with 12 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
import json
from monotonic import monotonic
from requests import (request, RequestException)
from requests.exceptions import HTTPError
from app.clients import (STATISTICS_DELIVERED, STATISTICS_FAILURE)
from app.clients.sms import (SmsClient, SmsClientResponseException)
@@ -104,7 +104,8 @@ class MMGClient(SmsClient):
headers={
'Content-Type': 'application/json',
'Authorization': 'Basic {}'.format(self.api_key)
}
},
timeout=60
)
response.raise_for_status()
@@ -117,6 +118,9 @@ class MMGClient(SmsClient):
except RequestException as e:
self.record_outcome(False, e.response)
raise MMGClientResponseException(response=e.response, exception=e)
except HTTPError as e:
self.record_outcome(False, e.response)
raise MMGClientResponseException(response=e.response, exception=e)
finally:
elapsed_time = monotonic() - start_time
self.statsd_client.timing("clients.mmg.request-time", elapsed_time)