Skip to content

Commit 8bc21c6

Browse files
authored
Merge pull request #25 from cuda-networks/fix_logging
remove error logging, exception can be caught by caller
2 parents ff430e0 + 202d4bf commit 8bc21c6

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

eb_sqs/worker/worker.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ def _enqueue_task(self, worker_task, delay, execute_inline, is_retry, count_retr
9797
self._add_to_group(worker_task)
9898

9999
logger.debug('%s task %s (%s, retry-id: %s): %s, %s (%s%s)',
100-
'Retrying' if is_retry else 'Delaying',
101-
worker_task.abs_func_name,
102-
worker_task.id,
103-
worker_task.retry_id,
104-
worker_task.args,
105-
worker_task.kwargs,
106-
worker_task.queue,
107-
', inline' if execute_inline else '')
100+
'Retrying' if is_retry else 'Delaying',
101+
worker_task.abs_func_name,
102+
worker_task.id,
103+
worker_task.retry_id,
104+
worker_task.args,
105+
worker_task.kwargs,
106+
worker_task.queue,
107+
', inline' if execute_inline else '')
108108

109109
if execute_inline:
110110
return self._execute_task(worker_task)
@@ -116,12 +116,12 @@ def _enqueue_task(self, worker_task, delay, execute_inline, is_retry, count_retr
116116
raise InvalidQueueException(ex.queue_name)
117117
except QueueClientException as ex:
118118
self._remove_from_group(worker_task)
119-
logger.exception('Task %s (%s, retry-id: %s) failed to enqueue to %s: %s',
120-
worker_task.abs_func_name,
121-
worker_task.id,
122-
worker_task.retry_id,
123-
worker_task.queue,
124-
ex)
119+
logger.warning('Task %s (%s, retry-id: %s) failed to enqueue to %s: %s',
120+
worker_task.abs_func_name,
121+
worker_task.id,
122+
worker_task.retry_id,
123+
worker_task.queue,
124+
ex)
125125

126126
raise QueueException()
127127

@@ -160,7 +160,8 @@ def _remove_from_group(self, worker_task):
160160
if self.group_client.remove(worker_task):
161161
self._execute_group_callback(worker_task)
162162

163-
def _execute_group_callback(self, worker_task):
163+
@staticmethod
164+
def _execute_group_callback(worker_task):
164165
# type: (WorkerTask) -> None
165166
if settings.GROUP_CALLBACK_TASK:
166167
callback = settings.GROUP_CALLBACK_TASK

0 commit comments

Comments
 (0)