From 7448b4e0c6a4dd141f9b0390dab8dde272091029 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 15 Sep 2025 00:19:20 +0300 Subject: [PATCH 1/3] fix --- .deploy/deploy-dev.yaml | 13 ++++++------- .deploy/deploy-prod.yaml | 10 ++++++---- helpers/mongo.py | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index ec1e48a..2e20dab 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -6,12 +6,12 @@ services: worker: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.dev.chocomarsh.com" STAGE: "development" MONGO_PASSWORD: $MONGO_PASSWORD_DEV networks: - queues-development - configurator + - mongo-development command: worker deploy: mode: replicated @@ -24,12 +24,11 @@ services: fetch: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.dev.chocomarsh.com" STAGE: "development" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN networks: - queues-development + - mongo-development command: fetch deploy: mode: replicated @@ -42,12 +41,11 @@ services: notify: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.dev.chocomarsh.com" STAGE: "development" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN networks: - queues-development + - mongo-development command: notify deploy: mode: replicated @@ -62,11 +60,10 @@ services: networks: - common-infra-nginx-development - queues-development + - mongo-development environment: - MONGO_HOST: "mongo.dev.chocomarsh.com" STAGE: "development" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN command: api deploy: mode: replicated @@ -83,3 +80,5 @@ networks: external: true configurator: external: true + mongo-development: + external: true diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index a8b471d..1905508 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -6,12 +6,12 @@ services: worker: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.chocomarsh.com" STAGE: "production" MONGO_PASSWORD: $MONGO_PASSWORD_PROD networks: - queues - configurator + - mongo command: worker deploy: mode: replicated @@ -24,13 +24,13 @@ services: fetch: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.chocomarsh.com" STAGE: "production" MONGO_PASSWORD: $MONGO_PASSWORD_PROD DEBUG: "false" networks: - queues - configurator + - mongo command: fetch deploy: mode: replicated @@ -43,13 +43,13 @@ services: notify: image: mathwave/sprint-repo:ruz-bot environment: - MONGO_HOST: "mongo.chocomarsh.com" STAGE: "production" MONGO_PASSWORD: $MONGO_PASSWORD_PROD DEBUG: "false" networks: - queues - configurator + - mongo command: notify deploy: mode: replicated @@ -64,8 +64,8 @@ services: networks: - common-infra-nginx - configurator + - mongo environment: - MONGO_HOST: "mongo.chocomarsh.com" STAGE: "production" MONGO_PASSWORD: $MONGO_PASSWORD_PROD DEBUG: "false" @@ -85,3 +85,5 @@ networks: external: true configurator: external: true + mongo: + external: true diff --git a/helpers/mongo.py b/helpers/mongo.py index 56a9b86..dd02e25 100644 --- a/helpers/mongo.py +++ b/helpers/mongo.py @@ -9,7 +9,7 @@ from helpers import now class Mongo: def __init__(self): - url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@{settings.MONGO_HOST}:27017/" + url = f"mongodb://{settings.MONGO_USER}:{settings.MONGO_PASSWORD}@mongo:27017/" self.client = pymongo.MongoClient(url) self.database = self.client.get_database("ruz-bot") self.users_collection.create_index([ From 7a2950e480d9302b1898a90a320929a0e367b0af Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 15 Sep 2025 00:28:09 +0300 Subject: [PATCH 2/3] fix --- utils/queues.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/queues.py b/utils/queues.py index 0187dab..9f1e3fc 100644 --- a/utils/queues.py +++ b/utils/queues.py @@ -1,6 +1,7 @@ from concurrent.futures import ThreadPoolExecutor import datetime import os +import traceback import zoneinfo import requests import time @@ -55,6 +56,7 @@ class TasksHandlerMixin: success = True except Exception as exc: print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}') + traceback.print_exc() success = False end = datetime.datetime.now(zoneinfo.ZoneInfo("Europe/Moscow")) if success: From 8799b3107b92481f55b86ed00856fbd70e3db9a6 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 15 Sep 2025 00:33:18 +0300 Subject: [PATCH 3/3] fix --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b638e7d..e99f46b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get install -y locales locales-all ENV LANGUAGE ru_RU.UTF-8 ENV LANG ru_RU.UTF-8 ENV LC_ALL ru_RU.UTF-8 +ENV PYTHONUNBUFFERED=1 COPY requirements.txt requirements.txt RUN pip install -r requirements.txt COPY . .