Merge branch 'bugfix/rate_limit_reached' into 'develop'

Fixed rate limit reached and empty file download bug See merge request core/sevenbridges-python!61
sbg · Apr 15, 2020 · 159101a · 159101a
2 parents 14cf41d + d32bed7
commit 159101a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sevenbridges/http/error_handlers.py b/sevenbridges/http/error_handlers.py
@@ -22,9 +22,11 @@ def rate_limit_sleeper(api, response):
     while response.status_code == 429:
         headers = response.headers
         remaining_time = headers.get('X-RateLimit-Reset')
-        sleep = int(remaining_time) - int(time.time())
+        sleep = max(int(remaining_time) - int(time.time()), 0)
+
         logger.warning('Rate limit reached! Waiting for [%s]s', sleep)
-        time.sleep(sleep + 5)
+        time.sleep(sleep)
+
         response = api.session.send(response.request)
     return response
 

diff --git a/sevenbridges/transfer/download.py b/sevenbridges/transfer/download.py
@@ -385,6 +385,6 @@ def _get_file_size(self):
         )
         file_size = int(file_size)
         if file_size == 0:
-            with io.open(self._file_path, 'a', encoding='utf-8'):
+            with io.open(self._temp_file, 'a', encoding='utf-8'):
                 pass
         return file_size