|
1 | 1 | from __future__ import absolute_import, unicode_literals |
2 | 2 |
|
3 | | -from datetime import timedelta, datetime |
4 | | - |
5 | 3 | import boto3 |
6 | 4 | import logging |
7 | | - |
8 | 5 | from botocore.config import Config |
9 | 6 | from botocore.exceptions import ClientError |
| 7 | +from datetime import timedelta |
10 | 8 | from django.utils import timezone |
11 | 9 |
|
12 | 10 | from eb_sqs import settings |
13 | 11 | from eb_sqs.worker.worker import Worker |
| 12 | +from eb_sqs.worker.worker_exceptions import ExecutionFailedException |
14 | 13 | from eb_sqs.worker.worker_factory import WorkerFactory |
15 | 14 |
|
16 | 15 | logger = logging.getLogger(__name__) |
@@ -55,7 +54,7 @@ def process_queues(self, queue_names): |
55 | 54 | timezone.now() - timedelta(seconds=settings.REFRESH_PREFIX_QUEUES_S) > last_update_time: |
56 | 55 | queues = static_queues + self.get_queues_by_prefixes(sqs, queue_prefixes) |
57 | 56 | last_update_time = timezone.now() |
58 | | - logger.info('[django-eb-sqs] Updated SQS queues: {}'.format( |
| 57 | + logger.debug('[django-eb-sqs] Updated SQS queues: {}'.format( |
59 | 58 | ', '.join([queue.url for queue in queues]) |
60 | 59 | )) |
61 | 60 |
|
@@ -119,6 +118,8 @@ def process_message(self, msg, worker): |
119 | 118 |
|
120 | 119 | worker.execute(msg.body) |
121 | 120 | logger.debug('[django-eb-sqs] Processed message {}'.format(msg.message_id)) |
| 121 | + except ExecutionFailedException as exc: |
| 122 | + logger.warning('[django-eb-sqs] Handling message {} got error: {}'.format(msg.message_id, repr(exc))) |
122 | 123 | except Exception as exc: |
123 | 124 | logger.error('[django-eb-sqs] Unhandled error: {}'.format(exc), exc_info=1) |
124 | 125 |
|
|
0 commit comments