Compare commits
No commits in common. "9c6b14e4cff94a42b9e96c53b75b438a2db4974f" and "335e68beb7543937d2a066e5e9b4a566fc7a2942" have entirely different histories.
9c6b14e4cf
...
335e68beb7
@ -23,7 +23,6 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
|
|||||||
return 'botalka_mailbox'
|
return 'botalka_mailbox'
|
||||||
|
|
||||||
def process(self, payload: dict):
|
def process(self, payload: dict):
|
||||||
print(f"Get message {payload}")
|
|
||||||
message = Message.model_validate(payload)
|
message = Message.model_validate(payload)
|
||||||
bot = platform.platform_client.get_config('bots')[message.project][message.name]
|
bot = platform.platform_client.get_config('bots')[message.project][message.name]
|
||||||
if not bot['mailbox_enabled']:
|
if not bot['mailbox_enabled']:
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
|
from threading import Thread
|
||||||
import zoneinfo
|
import zoneinfo
|
||||||
import requests
|
import requests
|
||||||
import time
|
import time
|
||||||
@ -17,6 +18,27 @@ class QueuesException(Exception):
|
|||||||
|
|
||||||
|
|
||||||
class TasksHandlerMixin:
|
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):
|
def poll(self):
|
||||||
while True:
|
while True:
|
||||||
@ -38,13 +60,13 @@ class TasksHandlerMixin:
|
|||||||
print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
|
print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}')
|
||||||
success = False
|
success = False
|
||||||
end = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow"))
|
end = datetime.datetime.now().astimezone(zoneinfo.ZoneInfo("Europe/Moscow"))
|
||||||
if success:
|
try:
|
||||||
try:
|
resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
|
||||||
resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']})
|
if resp.status_code != 202:
|
||||||
if resp.status_code != 202:
|
raise QueuesException
|
||||||
raise QueuesException
|
except:
|
||||||
except:
|
print(f'Failed to finish task id={task["id"]}')
|
||||||
print(f'Failed to finish task id={task["id"]}')
|
self.send_metric(start, success, end)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def queue_name(self):
|
def queue_name(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user