From ea3e4837f2b6db233d05bdfc4ff4e0ec5603f629 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 15 Jun 2025 03:45:21 +0300 Subject: [PATCH 1/2] fx --- utils/queues.py | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/utils/queues.py b/utils/queues.py index f96b78f..23d3535 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -21,26 +21,6 @@ class QueuesException(Exception): class TasksHandlerMixin: - def _send_metric(self, start, success, end): - try: - metric = requests.post('http://monitoring:1237/api/v1/metrics/task', json={ - 'timestamp': start.strftime("%Y-%m-%dT%H:%M:%S") + "Z", - 'service': 'botalka', - 'environment': stage, - 'queue': self.queue_name, - 'success': success, - 'execution_time_ms': (end - start).microseconds // 1000, - }) - if metric.status_code == 202: - print('metric ok') - else: - print(f'metric failed: {metric.status_code}') - except Exception as e: - print(f'metric failed: {e}') - - def send_metric(self, start, success, end): - # executor.submit(self._send_metric, start, success, end) - ... def poll(self): while True: @@ -62,13 +42,13 @@ class TasksHandlerMixin: print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}') success = False end = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow")) - 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"]}') - self.send_metric(start, success, end) + if success: + 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"]}') @property def queue_name(self): -- 2.45.2 From 82b5d571e55673238cb2b8742a6bf845cdf52395 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 15 Jun 2025 03:45:58 +0300 Subject: [PATCH 2/2] fx --- utils/queues.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/queues.py b/utils/queues.py index 23d3535..d19f196 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -1,4 +1,3 @@ -from concurrent.futures import ThreadPoolExecutor import datetime import os import zoneinfo @@ -13,9 +12,6 @@ else: QUEUES_URL = 'http://queues:1239' -executor = ThreadPoolExecutor(max_workers=1) - - class QueuesException(Exception): ... -- 2.45.2