diff --git a/.gitea/workflows/deploy-service-tg-bot.yaml b/.gitea/workflows/deploy-service-tg-bot.yaml index 81c08c0..14286ca 100644 --- a/.gitea/workflows/deploy-service-tg-bot.yaml +++ b/.gitea/workflows/deploy-service-tg-bot.yaml @@ -46,7 +46,7 @@ jobs: run: TG_BOT_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect build tg-bot - name: start container - run: TG_BOT_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never --wait tg-bot + run: TG_BOT_DEBUG='grammy*' TG_BOT_TAG=commit-${{env.GITHUB_SHA}} docker compose -p hereconnect up -d --pull never --wait tg-bot - name: rename to latest run: docker tag hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}} hereconnect/service-tg-bot:latest @@ -57,6 +57,6 @@ jobs: COUCHDB_TAG: latest run: docker compose -p hereconnect up -d --pull never --wait tg-bot -# - name: cleanup docker image -# if: always() -# run: docker rmi hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}} + - name: cleanup docker image + if: always() + run: docker rmi hereconnect/service-tg-bot:commit-${{env.GITHUB_SHA}} diff --git a/docker-compose.yml b/docker-compose.yml index d178d1f..36b7e8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,6 +70,7 @@ services: - API_URL=http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb:5984 - BOT_TOKEN=${BOT_TOKEN:-} - READ_BASE_URL=${READ_BASE_URL:-} + - DEBUG=${TG_BOT_DEBUG:-} depends_on: couchdb: condition: service_healthy diff --git a/packages/lib-service-health-checkserver/src/health-server.ts b/packages/lib-service-health-checkserver/src/health-server.ts index cbd6950..d0b9236 100644 --- a/packages/lib-service-health-checkserver/src/health-server.ts +++ b/packages/lib-service-health-checkserver/src/health-server.ts @@ -43,22 +43,20 @@ export function startHealthServer( } }); - const { promise, resolve, reject } = Promise.withResolvers(); - server.once("error", reject); - server.listen(port, hostname, resolve); + return new Promise((resolve, reject) => { + server.once("error", reject); + server.listen(port, hostname, () => { + resolve(); + console.log( + `Healthcheck server running on http://${hostname}:${port}/health`, + ); + }); - promise.then(() => { - console.log( - `Healthcheck server running on http://${hostname}:${port}/health`, - ); + // Закрываем сервер при активации AbortController + controller.signal.addEventListener("abort", () => { + console.log("Healthcheck server shutting down due to abort signal."); + reject(); + server.close(); + }); }); - - // Закрываем сервер при активации AbortController - controller.signal.addEventListener("abort", () => { - console.log("Healthcheck server shutting down due to abort signal."); - reject(); - server.close(); - }); - - return promise; } diff --git a/services/tg-bot/src/bot/index.ts b/services/tg-bot/src/bot/index.ts index bfb75a6..b26139f 100644 --- a/services/tg-bot/src/bot/index.ts +++ b/services/tg-bot/src/bot/index.ts @@ -54,7 +54,7 @@ bot.on("callback_query:data", callbackQueryHandler); await setupCommands(bot); // Запуск бота - await bot.start(); + bot.start(); await startHealthServer(abortController);