Compare commits

..

12 Commits

Author SHA1 Message Date
Egor Matveev
5581786225 fix
All checks were successful
Deploy Prod / Build (pull_request) Successful in 25s
Deploy Prod / Push (pull_request) Successful in 11s
Deploy Prod / Deploy prod (pull_request) Successful in 10s
2025-07-17 23:27:52 +03:00
Egor Matveev
66b4348957 fix
All checks were successful
Deploy Prod / Build (pull_request) Successful in 5s
Deploy Prod / Push (pull_request) Successful in 9s
Deploy Prod / Deploy prod (pull_request) Successful in 11s
2025-06-15 17:24:52 +03:00
Egor Matveev
33901b0a82 fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 5s
Deploy Dev / Push (pull_request) Successful in 9s
Deploy Dev / Deploy dev (pull_request) Successful in 17s
2025-06-15 17:13:54 +03:00
Egor Matveev
7b9d264ef9 fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 8s
Deploy Dev / Push (pull_request) Successful in 10s
Deploy Dev / Deploy dev (pull_request) Successful in 12s
2025-06-15 17:08:15 +03:00
Egor Matveev
a707a8b93e fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 7s
Deploy Dev / Push (pull_request) Successful in 10s
Deploy Dev / Deploy dev (pull_request) Successful in 18s
2025-06-15 16:49:40 +03:00
Egor Matveev
df3354a536 fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 7s
Deploy Dev / Push (pull_request) Successful in 9s
Deploy Dev / Deploy dev (pull_request) Successful in 17s
2025-06-15 16:45:51 +03:00
Egor Matveev
6a8f18300b fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 7s
Deploy Dev / Push (pull_request) Successful in 9s
Deploy Dev / Deploy dev (pull_request) Successful in 11s
2025-06-15 16:40:44 +03:00
Egor Matveev
b575ba5717 fix 2025-06-15 16:40:18 +03:00
Egor Matveev
24b1d39e10 fix 2025-06-15 16:39:33 +03:00
Egor Matveev
d61c665b6c fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 8s
Deploy Dev / Push (pull_request) Successful in 10s
Deploy Dev / Deploy dev (pull_request) Successful in 15s
2025-06-15 16:00:22 +03:00
Egor Matveev
4f0114e99a fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 6s
Deploy Dev / Push (pull_request) Successful in 9s
Deploy Dev / Deploy dev (pull_request) Successful in 12s
2025-06-15 14:53:13 +03:00
Egor Matveev
0cab3e52cb fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 5s
Deploy Dev / Push (pull_request) Successful in 9s
Deploy Dev / Deploy dev (pull_request) Successful in 12s
2025-06-15 14:45:14 +03:00
3 changed files with 12 additions and 17 deletions

View File

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

View File

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

View File

@@ -1,6 +1,9 @@
from concurrent.futures import ThreadPoolExecutor
import datetime
import json
import os
import traceback
import uuid
import zoneinfo
import requests
import time
@@ -20,11 +23,11 @@ class QueuesException(Exception):
class TasksHandlerMixin:
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.executor = ThreadPoolExecutor(max_workers=4)
self.executor = ThreadPoolExecutor(max_workers=1)
def _send_metric(self, start: datetime.datetime, end: datetime.datetime, success: bool):
try:
resp = requests.post('http://monitoring:1237/api/v1/metrics/task', json={
def send():
requests.post(f'{QUEUES_URL}/api/v1/metric', json={
'service': 'botalka',
'queue': self.queue_name,
'success': success,
@@ -33,12 +36,8 @@ class TasksHandlerMixin:
"execution_time_ms": (end - start).microseconds // 1000,
"environment": stage,
})
if resp.status_code == 202:
print("Metric ok")
else:
print(f'metric not ok: {resp.status_code}')
except Exception as e:
print(f"Error sending metric: {e}")
self.executor.submit(send)
def poll(self):
while True:
@@ -54,11 +53,12 @@ class TasksHandlerMixin:
continue
start = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
try:
print(f'process task with id {task["id"]}')
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()
success = False
end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow"))
if success:
@@ -66,9 +66,10 @@ class TasksHandlerMixin:
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.executor.submit(self._send_metric, start, end, success)
self._send_metric(start, end, success)
@property
def queue_name(self):