diff --git a/daemons/mailbox.py b/daemons/mailbox.py index 2fc236e..f5dc3f9 100644 --- a/daemons/mailbox.py +++ b/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']: diff --git a/utils/queues.py b/utils/queues.py index 583bcd1..d19f196 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -1,6 +1,5 @@ import datetime import os -from threading import Thread import zoneinfo import requests import time @@ -18,27 +17,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): - # Thread(target=self._send_metric, args=(start, success, end)).start() - # self._send_metric(start, success, end) - ... def poll(self): while True: @@ -60,13 +38,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):