From 5264fc0d90a93df3fd5b2b0ef06bd7615855d143 Mon Sep 17 00:00:00 2001 From: Egor Date: Tue, 7 Oct 2025 06:26:37 +0300 Subject: [PATCH] Revert "Allow configuring Tribute webhook host" --- .env.example | 1 - README.md | 1 - app/config.py | 1 - app/external/webhook_server.py | 31 +++++++------------------------ 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/.env.example b/.env.example index b560aa3e..77f05953 100644 --- a/.env.example +++ b/.env.example @@ -161,7 +161,6 @@ TRIBUTE_ENABLED=false TRIBUTE_API_KEY= TRIBUTE_DONATE_LINK= TRIBUTE_WEBHOOK_PATH=/tribute-webhook -TRIBUTE_WEBHOOK_HOST=0.0.0.0 TRIBUTE_WEBHOOK_PORT=8081 # YooKassa (https://yookassa.ru) diff --git a/README.md b/README.md index a20c63ea..71c70984 100644 --- a/README.md +++ b/README.md @@ -710,7 +710,6 @@ TRIBUTE_ENABLED=false TRIBUTE_API_KEY= TRIBUTE_DONATE_LINK= TRIBUTE_WEBHOOK_PATH=/tribute-webhook -TRIBUTE_WEBHOOK_HOST=0.0.0.0 TRIBUTE_WEBHOOK_PORT=8081 # YooKassa (https://yookassa.ru) diff --git a/app/config.py b/app/config.py index 535a7ec5..2af377a7 100644 --- a/app/config.py +++ b/app/config.py @@ -149,7 +149,6 @@ class Settings(BaseSettings): TRIBUTE_API_KEY: Optional[str] = None TRIBUTE_DONATE_LINK: Optional[str] = None TRIBUTE_WEBHOOK_PATH: str = "/tribute-webhook" - TRIBUTE_WEBHOOK_HOST: str = "0.0.0.0" TRIBUTE_WEBHOOK_PORT: int = 8081 YOOKASSA_ENABLED: bool = False diff --git a/app/external/webhook_server.py b/app/external/webhook_server.py index 99531c59..d11f75da 100644 --- a/app/external/webhook_server.py +++ b/app/external/webhook_server.py @@ -66,37 +66,20 @@ class WebhookServer: self.site = web.TCPSite( self.runner, - host=settings.TRIBUTE_WEBHOOK_HOST, + host='0.0.0.0', port=settings.TRIBUTE_WEBHOOK_PORT ) - + await self.site.start() - - logger.info( - "Webhook сервер запущен на %s:%s", - settings.TRIBUTE_WEBHOOK_HOST, - settings.TRIBUTE_WEBHOOK_PORT, - ) - logger.info( - "Tribute webhook URL: http://%s:%s%s", - settings.TRIBUTE_WEBHOOK_HOST, - settings.TRIBUTE_WEBHOOK_PORT, - settings.TRIBUTE_WEBHOOK_PATH, - ) + + logger.info(f"Webhook сервер запущен на порту {settings.TRIBUTE_WEBHOOK_PORT}") + logger.info(f"Tribute webhook URL: http://0.0.0.0:{settings.TRIBUTE_WEBHOOK_PORT}{settings.TRIBUTE_WEBHOOK_PATH}") if settings.is_mulenpay_enabled(): logger.info( - "Mulen Pay webhook URL: http://%s:%s%s", - settings.TRIBUTE_WEBHOOK_HOST, - settings.TRIBUTE_WEBHOOK_PORT, - settings.MULENPAY_WEBHOOK_PATH, + f"Mulen Pay webhook URL: http://0.0.0.0:{settings.TRIBUTE_WEBHOOK_PORT}{settings.MULENPAY_WEBHOOK_PATH}" ) if settings.is_cryptobot_enabled(): - logger.info( - "CryptoBot webhook URL: http://%s:%s%s", - settings.TRIBUTE_WEBHOOK_HOST, - settings.TRIBUTE_WEBHOOK_PORT, - settings.CRYPTOBOT_WEBHOOK_PATH, - ) + logger.info(f"CryptoBot webhook URL: http://0.0.0.0:{settings.TRIBUTE_WEBHOOK_PORT}{settings.CRYPTOBOT_WEBHOOK_PATH}") except Exception as e: logger.error(f"Ошибка запуска webhook сервера: {e}")