Added support for timeouts in messaging module

carsongee · carsongee · commit 861b9ca0cf4e · 2018-03-08T13:30:01.000-05:00
diff --git a/firebase_admin/messaging.py b/firebase_admin/messaging.py
@@ -748,6 +748,7 @@ def __init__(self, app):
                 'GCLOUD_PROJECT environment variable.')
         self._fcm_url = _MessagingService.FCM_URL.format(project_id)
         self._client = _http_client.JsonHttpClient(credential=app.credential.get_credential())
+        self._timeout = app.options.get('httpTimeout')
 
     @classmethod
     def encode_message(cls, message):
@@ -757,10 +758,11 @@ def encode_message(cls, message):
 
     def send(self, message, dry_run=False):
         data = {'message': _MessagingService.encode_message(message)}
+        import ipdb; ipdb.set_trace()
         if dry_run:
             data['validate_only'] = True
         try:
-            resp = self._client.body('post', url=self._fcm_url, json=data)
+            resp = self._client.body('post', url=self._fcm_url, json=data, timeout=self._timeout)
         except requests.exceptions.RequestException as error:
             if error.response is not None:
                 self._handle_fcm_error(error)
@@ -791,7 +793,12 @@ def make_topic_management_request(self, tokens, topic, operation):
         url = '{0}/{1}'.format(_MessagingService.IID_URL, operation)
         try:
             resp = self._client.body(
-                'post', url=url, json=data, headers=_MessagingService.IID_HEADERS)
+                'post',
+                url=url,
+                json=data,
+                headers=_MessagingService.IID_HEADERS,
+                timeout=self._timeout
+            )
         except requests.exceptions.RequestException as error:
             if error.response is not None:
                 self._handle_iid_error(error)
