Merge pull request 'fix' (#78) from metric into dev

Reviewed-on: https://gitea.chocomarsh.com/self/botalka/pulls/78
This commit is contained in:
emmatveev 2025-06-15 17:08:46 +03:00
commit bea73c9322
4 changed files with 3 additions and 5 deletions

View File

@ -38,5 +38,3 @@ networks:
external: true external: true
queues-development: queues-development:
external: true external: true
monitoring:
external: true

View File

@ -13,7 +13,7 @@ class Daemon(base.Daemon):
for file in os.listdir('/usr/src/metrics'): for file in os.listdir('/usr/src/metrics'):
data = open(f'/usr/src/metrics/{file}', 'r').read() data = open(f'/usr/src/metrics/{file}', 'r').read()
payload = json.loads(data) payload = json.loads(data)
resp = post('http://monitoring:1237/api/v1/metrics/task', json=payload) resp = post('http://queues:1239/api/v1/metric', json=payload)
if resp.status_code == 202: if resp.status_code == 202:
print("Metric ok") print("Metric ok")
else: else:

2
run.sh
View File

@ -4,7 +4,7 @@
python3 main.py $1 & python3 main.py $1 &
# Start the second process # Start the second process
# python3 main.py metrics & python3 main.py metrics &
# Wait for any process to exit # Wait for any process to exit
wait -n wait -n

View File

@ -60,7 +60,7 @@ class TasksHandlerMixin:
print(f'finish task with id {task["id"]}') print(f'finish task with id {task["id"]}')
except: except:
print(f'Failed to finish task id={task["id"]}') print(f'Failed to finish task id={task["id"]}')
# self._send_metric(start, end, success) self._send_metric(start, end, success)
@property @property
def queue_name(self): def queue_name(self):