Merge pull request 'fix' (#46) from master into prod

Reviewed-on: #46

daemons/poll.py

@@ -1,7 +1,6 @@
 import telebot
 import multiprocessing
 import time
-import json
 
 from daemons import base
 from utils import platform

utils/queues.py

@@ -1,10 +1,4 @@
-from concurrent.futures import ThreadPoolExecutor
-import datetime
-import json
 import os
-import traceback
-import uuid
-import zoneinfo
 import requests
 import time
 
@@ -21,24 +15,6 @@ class QueuesException(Exception):
 
 
 class TasksHandlerMixin:
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.executor = ThreadPoolExecutor(max_workers=1)
-
-    def _send_metric(self, start: datetime.datetime, end: datetime.datetime, success: bool):
-        def send():
-            requests.post(f'{QUEUES_URL}/api/v1/metric', json={
-                'service': 'botalka',
-                'queue': self.queue_name,
-                'success': success,
-                'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z",
-                "success": success,
-                "execution_time_ms": (end - start).microseconds // 1000,
-                "environment": stage,
-            })
-        
-        self.executor.submit(send)
-
     def poll(self):
         while True:
             try:
@@ -51,25 +27,17 @@ class TasksHandlerMixin:
             if not task:
                 time.sleep(0.2)
                 continue
-            start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
             try:
-                print(f'process task with id {task["id"]}, attempt {task["attempt"]}')
                 self.process(task['payload'])
-                success = True
             except Exception as exc:
                 print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
-                traceback.print_stack()
+                continue
-                success = False
+            try:
-            end = datetime.datetime.now(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
-                    print(f'finish task with id {task["id"]}')
-                except:
-                    print(f'Failed to finish task id={task["id"]}')
-            self._send_metric(start, end, success)
 
     @property
     def queue_name(self):