Merge pull request #54 from cuda-networks/fix-health-check

Fix the healthcheck

Author: rohandev

eb_sqs/worker/service.py

@@ -29,6 +29,9 @@ class WorkerService(object):
 
     def process_queues(self, queue_names):
         # type: (list) -> None
+        self.write_healthcheck_file()
+        self.last_healthcheck_time = timezone.now()
+
         logger.debug('[django-eb-sqs] Connecting to SQS: {}'.format(', '.join(queue_names)))
 
         sqs = boto3.resource(
@@ -44,9 +47,6 @@ def process_queues(self, queue_names):
         static_queues = queues
         last_update_time = timezone.now() - timedelta(seconds=settings.REFRESH_PREFIX_QUEUES_S)
 
-        self.write_healthcheck_file()
-        last_healthcheck_time = timezone.now()
-
         logger.debug('[django-eb-sqs] Connected to SQS: {}'.format(', '.join(queue_names)))
 
         worker = WorkerFactory.default().create()
@@ -75,12 +75,9 @@ def process_queues(self, queue_names):
             else:
                 self.process_messages(queues, worker, static_queues)
 
-            if timezone.now() - timedelta(seconds=settings.MIN_HEALTHCHECK_WRITE_PERIOD_S) > last_healthcheck_time:
-                self.write_healthcheck_file()
-                last_healthcheck_time = timezone.now()
-
     def process_messages(self, queues, worker, static_queues):
         # type: (list, Worker, list) -> None
+
         for queue in queues:
             try:
                 messages = self.poll_messages(queue)
@@ -101,6 +98,10 @@ def process_messages(self, queues, worker, static_queues):
                 self.delete_messages(queue, msg_entries)
 
                 self._send_signal(MESSAGES_DELETED, messages=messages)
+
+                if timezone.now() - timedelta(seconds=settings.MIN_HEALTHCHECK_WRITE_PERIOD_S) > self.last_healthcheck_time:
+                    self.write_healthcheck_file()
+                    self.last_healthcheck_time = timezone.now()
             except ClientError as exc:
                 error_code = exc.response.get('Error', {}).get('Code', None)
                 if error_code == 'AWS.SimpleQueueService.NonExistentQueue' and queue not in static_queues: