From 26519dd977b1bbad74a7bc1a5516a528d35c7d09 Mon Sep 17 00:00:00 2001
From: Egor Matveev <e.matveev@hh.ru>
Date: Sun, 15 Jun 2025 17:28:45 +0300
Subject: [PATCH] fix

---
 .DS_Store       | Bin 0 -> 6148 bytes
 utils/queues.py |  49 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1180528f64cbe2dbf1a8156b028b5185c37d3303
GIT binary patch
literal 6148
zcmeHKO^?z*7=DNCLV>6pG|_`e6R!l>U9)PuAg%|mV)UQ}Tfp6BO9yEIH-v<{{s#Yo
zXa9)*#gjho%&=*TUN^+dOJ<(=c;1<Jo=!Uq5sB_>ctF%3A{U9#sUiD|aX+UmE18xX
zK%vHnNYcfNNDhK%i)|aM0#<=tQ-I&y3bklRBbrd={gnZF@L3Rdf!}^BQ^7l6pHfJv
ze$Ov?UkbePhKG^;0{2&eTf5|j7(2#SWJ;sFPwBMa!%@#Ep#j*4KF_A7i2Qmc>N@rD
zo6rULKGGSYLd&)nwK856jO>Fs#vCyv1@?DDlx5fG1iS&A!(&Pxp;1(fOR1UlsbFj$
z%owXdbom(sYno-3=@ZQ`I;TQ3f;G)@8?2$?hpIG2Ev6KTwUB=<K0l>z)_)(fq-qU?
znONK0j>s^BMKTE@wI_ZAlPFBmcKfF&?K%79id%8(?)%=ET=Y^uoh4m=`j%_2q>O@1
z*$-ZaqeZ`Q^O=lOKa59H<q!@>puBq%#zVR2%2_;2ly6UWxK+2>Z`@ff584lpn%<+s
z_NwVEA0M`x-h-p#)vD^=x_AG{%l>&ZjwOo<6F9PzT{F0WuP9`eH1AF0NXESV*u%l5
zV<G4HM@76DvaboMyKY7Rx4!Fv+W4#jR)H&5fWHqO5@W~UTBG`OAX8TWpo3;*DDz!{
zeLRC5gKLfGfeGyj)ULu@F@$zUyJvVEgKLf2orJl32s5)VHx!{}$M~M2ljvx)xmCa_
zkXK+&R~vl(KmYgrKksB~RspNPf2DwMPI@O@EXka$TZ`kf)<gP$#Kyd}M&*Lc9LK7_
fNAYbWW$5#`0PGlCYeWmo{t-|z*vu+$r3(B3T;=v_

literal 0
HcmV?d00001

diff --git a/utils/queues.py b/utils/queues.py
index c00a18c..7aacd89 100644
--- a/utils/queues.py
+++ b/utils/queues.py
@@ -1,4 +1,7 @@
+from concurrent.futures import ThreadPoolExecutor
+import datetime
 import os
+import zoneinfo
 import requests
 import time
 
@@ -15,24 +18,54 @@ 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:
-            response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
+            try:
+                response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json()
+            except requests.JSONDecodeError:
+                print('Unable to decode json')
+                time.sleep(3)
+                continue
             task = response.get('task')
             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}')
-                continue
-            try:
-                resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
-                if resp.status_code != 202:
-                    raise QueuesException
-            except:
-                print(f'Failed to finish task id={task["id"]}')
+                success = False
+            end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
+            if success:
+                try:
+                    resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
+                    if resp.status_code != 202:
+                        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):