Fixes to the process_queue command

Author: Itay Bleier

eb_sqs/management/commands/process_queue.py

@@ -6,6 +6,7 @@
 from django.core.management import BaseCommand, CommandError
 
 from eb_sqs import settings
+from eb_sqs.worker.worker import Worker
 from eb_sqs.worker.worker_factory import WorkerFactory
 
 logger = logging.getLogger(__name__)
@@ -23,14 +24,16 @@ def handle(self, *args, **options):
         if not options['queue_names']:
             raise CommandError('Queue names (--queues) not specified')
 
-        queue_names = options['queue_names'].split(',')
+        queue_names = [queue_name.trim() for queue_name in options['queue_names'].split(',')]
 
-        logger.debug('Connecting to SQS: {}'.format(', '.join(queue_names)))
+        logger.debug('[django-eb-sqs] Connecting to SQS: {}'.format(', '.join(queue_names)))
 
         sqs = boto3.resource('sqs', region_name=settings.AWS_REGION)
         queues = [sqs.get_queue_by_name(QueueName=queue_name) for queue_name in queue_names]
 
-        logger.debug('Connected to SQS: {}'.format(', '.join(queue_names)))
+        logger.debug('[django-eb-sqs] Connected to SQS: {}'.format(', '.join(queue_names)))
+
+        worker = WorkerFactory.default().create()
 
         while True:
             for queue in queues:
@@ -40,13 +43,16 @@ def handle(self, *args, **options):
                 )
 
                 for msg in messages:
-                    logger.debug('Read message {}'.format(msg.message_id))
-                    self._process_message(msg)
-                    logger.debug('Processed message {}'.format(msg.message_id))
-                    msg.delete()
-                    logger.debug('Deleted message {}'.format(msg.message_id))
-
-    def _process_message(self, message):
-        # type: (Message) -> None
-        worker = WorkerFactory.default().create()
-        worker.execute(message.body)
+                    self._process_message(msg, worker)
+
+    def _process_message(self, msg, worker):
+        # type: (Any, Worker) -> None
+        logger.debug('[django-eb-sqs] Read message {}'.format(msg.message_id))
+        try:
+            worker.execute(msg.body)
+            logger.debug('[django-eb-sqs] Processed message {}'.format(msg.message_id))
+        except Exception as exc:
+            logger.error('[django-eb-sqs] Unhandled error: {}'.format(exc), exc_info=1)
+        finally:
+            msg.delete()
+            logger.debug('[django-eb-sqs] Deleted message {}'.format(msg.message_id))

eb_sqs/settings.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 
-AWS_REGION = getattr(settings, 'AWS_REGION', 'us-east-1')  # type: unicode
+AWS_REGION = getattr(settings, 'EB_AWS_REGION', 'us-east-1')  # type: unicode
 
 MAX_NUMBER_OF_MESSAGES = getattr(settings, 'EB_SQS_MAX_NUMBER_OF_MESSAGES', 10)  # type: int
 WAIT_TIME_S = getattr(settings, 'EB_SQS_WAIT_TIME_S', 2)  # type: int