diff --git a/gcloud/rest/taskqueue/manager.py b/gcloud/rest/taskqueue/manager.py index b50de73..f17e0b5 100644 --- a/gcloud/rest/taskqueue/manager.py +++ b/gcloud/rest/taskqueue/manager.py @@ -106,8 +106,9 @@ def find_and_process_work(self): task_lease = self.tq.lease(num_tasks=self.batch_size, lease_duration=self.lease_seconds) except requests.exceptions.HTTPError as e: - log.error('got error attempting to lease tasks, retrying', - exc_info=e) + if e.response.status_code != 429: + log.error('got error attempting to lease tasks, retrying', + exc_info=e) return True if not task_lease: diff --git a/gcloud/rest/taskqueue/queue.py b/gcloud/rest/taskqueue/queue.py index 63ee97f..e5f5893 100644 --- a/gcloud/rest/taskqueue/queue.py +++ b/gcloud/rest/taskqueue/queue.py @@ -1,4 +1,3 @@ -import logging import threading import requests @@ -6,8 +5,6 @@ from gcloud.rest.auth import Token -log = logging.getLogger(__name__) - API_ROOT = 'https://cloudtasks.googleapis.com/v2beta2' LOCATION = 'us-central1' SCOPES = [ @@ -15,18 +12,6 @@ ] -def raise_for_status(resp): - try: - resp.raise_for_status() - except requests.exceptions.HTTPError as e: - try: - log.error(e.response.json()) - except ValueError: - log.error(e.response.text) - - raise - - class TaskQueue(object): def __init__(self, project, taskqueue, creds=None, google_api_lock=None, location=LOCATION): @@ -64,7 +49,7 @@ def ack(self, task): with self.google_api_lock: resp = requests.post(url, headers=self.headers(), json=body) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/cancelLease @@ -79,7 +64,7 @@ def cancel(self, task): with self.google_api_lock: resp = requests.post(url, headers=self.headers(), json=body) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/delete @@ -89,7 +74,7 @@ def delete(self, tname): with self.google_api_lock: resp = requests.delete(url, headers=self.headers()) - raise_for_status(resp) + resp.raise_for_status() return resp.json() def drain(self): @@ -114,7 +99,7 @@ def get(self, tname, full=False): with self.google_api_lock: resp = requests.get(url, headers=self.headers(), params=params) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/create @@ -134,7 +119,7 @@ def insert(self, payload, tag=None): with self.google_api_lock: resp = requests.post(url, headers=self.headers(), json=body) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/lease @@ -152,7 +137,7 @@ def lease(self, num_tasks=1, lease_duration=10, task_filter=None): with self.google_api_lock: resp = requests.post(url, headers=self.headers(), json=body) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/list @@ -167,7 +152,7 @@ def list(self, full=False, page_size=1000, page_token=''): with self.google_api_lock: resp = requests.get(url, headers=self.headers(), params=params) - raise_for_status(resp) + resp.raise_for_status() return resp.json() # https://cloud.google.com/cloud-tasks/docs/reference/rest/v2beta2/projects.locations.queues.tasks/renewLease @@ -183,5 +168,5 @@ def renew(self, task, lease_duration=10): with self.google_api_lock: resp = requests.post(url, headers=self.headers(), json=body) - raise_for_status(resp) + resp.raise_for_status() return resp.json() diff --git a/setup.py b/setup.py index dad52f5..aedfd88 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setuptools.setup( name='gcloud-rest', - version='1.5.1', + version='1.5.2', description='RESTful Python Client for Google Cloud', long_description=README, namespace_packages=[