From e2c6e61b5d20fe035a0ef3fb4a7a04b3ca0e91ff Mon Sep 17 00:00:00 2001 From: UdoChudo Date: Sun, 9 Feb 2025 12:57:32 +0500 Subject: [PATCH] Update packages --- Dockerfile | 2 +- telezab.py | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 062700a..c6f3869 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.3-slim +FROM python:3.13.1-slim LABEL authors="UdoChudo" # Установим необходимые пакеты RUN apt-get update && apt-get install -y \ diff --git a/telezab.py b/telezab.py index 66cff1e..6f4443f 100644 --- a/telezab.py +++ b/telezab.py @@ -1,16 +1,11 @@ import os from functools import partial -from gc import callbacks - from flask import Flask, request, jsonify, render_template -import schedule from dotenv import load_dotenv import hashlib import telebot from telebot import types import logging -from logging.config import dictConfig -import zipfile from threading import Thread, Lock import sqlite3 import time @@ -23,7 +18,7 @@ from concurrent.futures import ThreadPoolExecutor from pyzabbix import ZabbixAPI import requests from pytz import timezone -from datetime import datetime, timedelta +from datetime import datetime import re import urllib.parse @@ -49,7 +44,7 @@ RABBITMQ_HOST = os.getenv('RABBITMQ_HOST', 'localhost') RABBITMQ_QUEUE = 'telegram_notifications' RABBITMQ_LOGIN = os.getenv('RABBITMQ_LOGIN') RABBITMQ_PASS = os.getenv('RABBITMQ_PASS') -RABBITMQ_URL = "amqp://"+ RABBITMQ_LOGIN + ":" + RABBITMQ_PASS + "@" + RABBITMQ_HOST +"/" # Замените на ваш URL RabbitMQ +RABBITMQ_URL_FULL = f"amqp://{RABBITMQ_LOGIN}:{RABBITMQ_PASS}@{RABBITMQ_HOST}/" # Инициализируем класс RegionApi region_api = RegionAPI(DB_PATH) # Инициализируем класс UserStateManager @@ -869,7 +864,7 @@ async def consume_from_queue(): while True: # Бесконечный цикл для переподключения try: # Подключение к RabbitMQ - connection = await aio_pika.connect_robust(RABBITMQ_URL) + connection = await aio_pika.connect_robust(RABBITMQ_URL_FULL) async with connection: # Открываем канал channel = await connection.channel()