From c997e49a745be5134cbb0f4f36dc7ae8614447d0 Mon Sep 17 00:00:00 2001 From: UdoChudo Date: Sun, 9 Feb 2025 12:23:21 +0500 Subject: [PATCH 1/2] Update packages --- requirements.txt | Bin 972 -> 567 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index aeb851bd446b549b7d6adff7102b4f37bfe9225c..dcf90c6af6db011a3d5e8dc120bb7e200d1a39fa 100644 GIT binary patch literal 567 zcmXw0L5|}f5WMr3AY;c-a^Ns?7-?4;X{23g&uvVc9upvdSFvBeg`>UEUENh(1#vh; zo=NMA?B!7qha1JX+SLx^T-LgkM|s-&r9`besgzW0ZKV4{>ytc7RjbUCC#SWNodjG; zs>{7pvJr!0KigEn3rb^C;VT1f_JK|bbEA}PIe4&=lEE z+Sht7J}J#h{6$w=I}OIl=?p8vJB8_ zu-b{3LNsJZ GjN%_I#HnTg literal 972 zcmYL{PfNp45XAQ^_)#h~t*stB=s{2r1O?COzcku5wMoVH!>hm9&1(n`lFaPv?7aQ^ z&8@V`me%lW?UrX?7k0zBvU5ALz-w5AZTMO_=Mr4J%a)_+oz;$Ij%1*HM<>*j)PC9= zjykCNnv*#`_5Tf=1xI*BWoAPdW6rQ;E$OZvb9(jAtN2>GqtcEiZMo7(+Uh-}w{+E0 zy~nL$g)^z-t|LYtRDDOzcmU7o7}Zi0K5%S7UFCf@K3|QiG@BG6nbKySnh@1T=MruW zl7kiQyt4f%J$X;rJ$Z5;Ff&(|h9-zip83DS-JY9!<$ZycI;mc)xWP5}ijMN4EW+mq zT+;++OSMwU@uRycTAgl^E&qk58M}-V(qn>#UXykbsmn#=6?@dfX{QrgmZsU-!QPl) z#VOibxhLbs?(D@Ly|eset{S_gnuhJI@Z4iQvFE&hpL~W3ZE|pr?PO`g;+}*ZnQp>U z+Rv#v@>cZ@-7lt_`;=+ZHJ#Fq8EZ0J!kBsDaTiKJjM&FLIxF9o2{q}iI{ck#-Kh3? U-`;{ebbEKer8Lq#D8tx>f8M%_F#rGn From e2c6e61b5d20fe035a0ef3fb4a7a04b3ca0e91ff Mon Sep 17 00:00:00 2001 From: UdoChudo Date: Sun, 9 Feb 2025 12:57:32 +0500 Subject: [PATCH 2/2] 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()