From 889a408c57fb4ce83b69ce5ddf004b0129594749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=20=D0=97=D0=B2=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2?= Date: Thu, 19 Sep 2024 15:36:19 +0500 Subject: [PATCH] Small cleanup code --- telezab.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/telezab.py b/telezab.py index 5c2a574..c12fd1e 100644 --- a/telezab.py +++ b/telezab.py @@ -64,6 +64,12 @@ ZABBIX_URL = os.getenv('ZABBIX_URL') DB_PATH = 'db/telezab.db' SUPPORT_EMAIL = "shiftsupport-rtmis@rtmis.ru" BASE_URL = '/telezab' + +# RabbitMQ configuration +RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'localhost') +RABBITMQ_QUEUE = 'telegram_notifications' +RABBITMQ_LOGIN = os.getenv('RABBITMQ_LOGIN') +RABBITMQ_PASS = os.getenv('RABBITMQ_PASS') # Инициализируем класс RegionApi region_api = RegionAPI(DB_PATH) # Инициализируем класс UserStateManager @@ -815,14 +821,12 @@ def handle_active_regions_button(message): regions_list = format_regions_list(regions) bot.send_message(chat_id, f"Активные регионы:\n{regions_list}") show_settings_menu(chat_id) -# RabbitMQ configuration -RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'localhost') -RABBITMQ_QUEUE = 'telegram_notifications' + def rabbitmq_connection(): # Создаем объект учетных данных - credentials = pika.PlainCredentials('admin', 'admin') + credentials = pika.PlainCredentials(RABBITMQ_LOGIN,RABBITMQ_PASS) # Указываем параметры подключения, включая учетные данные parameters = pika.ConnectionParameters(