Merge pull request 'master' (#60) from master into prod

Reviewed-on: #60

.deploy/deploy-dev.yaml

@@ -22,6 +22,7 @@ services:
     networks:
       - configurator
       - queues-development
+      - monitoring
     environment:
       STAGE: "development"
     command: mailbox
@@ -38,3 +39,5 @@ networks:
     external: true
   queues-development:
     external: true
+  monitoring:
+    external: true

.deploy/deploy-prod.yaml

@@ -22,6 +22,7 @@ services:
     networks:
       - configurator
       - queues
+      - monitoring
     environment:
       STAGE: "production"
     command: mailbox
@@ -38,3 +39,5 @@ networks:
     external: true
   queues:
     external: true
+  monitoring:
+    external: true

daemons/mailbox.py

@@ -23,6 +23,7 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
         return 'botalka_mailbox'
     
     def process(self, payload: dict):
+        print(f"Get message {payload}")
         message = Message.model_validate(payload)
         bot = platform.platform_client.get_config('bots')[message.project][message.name]
         if not bot['mailbox_enabled']:

utils/queues.py

@@ -1,4 +1,6 @@
+import datetime
 import os
+import zoneinfo
 import requests
 import time
 
@@ -15,6 +17,7 @@ class QueuesException(Exception):
 
 
 class TasksHandlerMixin:
+
     def poll(self):
         while True:
             try:
@@ -27,17 +30,21 @@ class TasksHandlerMixin:
             if not task:
                 time.sleep(0.2)
                 continue
+            start = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow"))
             try:
                 self.process(task['payload'])
+                success = True
             except Exception as exc:
                 print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
-                continue
+                success = False
-            try:
+            end = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow"))
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
+            if success:
-                if resp.status_code != 202:
+                try:
-                    raise QueuesException
+                    resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
-            except:
+                    if resp.status_code != 202:
-                print(f'Failed to finish task id={task["id"]}')
+                        raise QueuesException
+                except:
+                    print(f'Failed to finish task id={task["id"]}')
 
     @property
     def queue_name(self):