vvzvlad/pyrogram-bridge
1
0
Fork 0
Code Issues 6 Pull Requests Actions 8 Packages Projects Releases Wiki Activity

implement forceful termination in api_server and TelegramClient: add force_exit function for immediate process shutdown, update SIGTERM handler for forceful exit, and adjust restart logic in connection_handler to use SIGKILL

Browse Source
This commit is contained in:
vvzvlad
2025-06-10 14:28:51 +03:00
parent d3366ca7ef
commit 521c3dc394
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api_server.py
+16 -5
View File
@@ -109,10 +109,21 @@ if __name__ == "__main__":
# Log uvloop status
logger.info(" uvloop: enabled (asyncio speedup active)")
# Добавляем обработчик сигнала SIGTERM для корректного завершения
# Add a function to forcefully kill the process
def force_exit(exit_code=1):
"""Force exit the process to trigger Docker container restart"""
logger.critical(f"Force exiting process with code {exit_code}")
try:
# Try to kill the process with SIGKILL
os.kill(os.getpid(), signal.SIGKILL)
except:
# If that fails, use os._exit
os._exit(exit_code)
# Add SIGTERM signal handler for proper termination
def handle_sigterm(signum, frame):
logger.warning("Received SIGTERM signal, shutting down gracefully")
sys.exit(0)
logger.warning("Received SIGTERM signal, shutting down forcefully")
force_exit(0) # Exit with code 0 for graceful shutdown
signal.signal(signal.SIGTERM, handle_sigterm)
@@ -127,10 +138,10 @@ if __name__ == "__main__":
except OSError as e:
if "[Errno 98] Address already in use" in str(e):
logger.critical(f"Port {Config['api_port']} is already in use. Exiting with code 1 to trigger Docker restart.")
sys.exit(1)
force_exit(1)
else:
logger.critical(f"Failed to start server: {str(e)}")
sys.exit(1)
force_exit(1)
async def find_file_id_in_message(message: Message, file_unique_id: str) -> Union[str, None]:
"""Find file_id by checking all possible media types in message"""
telegram_client.py
+5 -13
View File
@@ -72,20 +72,12 @@ class TelegramClient:
raise
def _restart_app(self):
"""Restarts the application by exiting with non-zero code to trigger Docker container restart"""
logger.warning("connection_handler: restarting application by exit with error code")
"""Restarts the application by forcefully killing the process to trigger Docker container restart"""
logger.warning("connection_handler: restarting application by forceful termination")
try:
# Properly shutdown client before exit
loop = asyncio.get_event_loop()
if loop.is_running():
loop.create_task(self.stop())
logger.info("connection_handler: waiting for resources to be freed before restart")
time.sleep(2)
# Выходим с ненулевым кодом, чтобы Docker перезапустил контейнер
logger.critical("connection_handler: forcefully exiting process with code 1")
sys.exit(1)
# Forcefully kill the process using SIGKILL to ensure immediate termination
logger.critical("connection_handler: sending SIGKILL to self")
os.kill(os.getpid(), signal.SIGKILL)
except Exception as e:
logger.error(f"connection_handler: error during restart: {str(e)}")
# Emergency termination
tg_cache.py
+21 -26
View File
@@ -22,26 +22,26 @@ from pyrogram.types import Chat, Message
logger = logging.getLogger(__name__)
# Путь к директории кеша
# Path to cache directory
CACHE_DIR = os.path.join('data', 'tgcache')
def _get_history_cache_file_path(channel_id: Union[str, int]) -> str:
"""Возвращает путь к файлу кеша истории сообщений для канала"""
"""Returns path to the message history cache file for the channel"""
if not os.path.exists(CACHE_DIR):
os.makedirs(CACHE_DIR, exist_ok=True)
logger.info(f"cache_dir_created: path {CACHE_DIR}")
# Преобразуем в строку для унификации
# Convert to string for uniformity
channel_id_str = str(channel_id)
# Заменяем потенциально проблемные символы
# Replace potentially problematic characters
safe_filename = channel_id_str.replace('/', '_').replace('\\', '_')
return os.path.join(CACHE_DIR, f"{safe_filename}.cache")
def _save_history_to_cache(channel_id: Union[str, int], messages: List[Message], limit: int) -> None:
"""Сохраняет историю сообщений в кеш"""
"""Saves message history to cache"""
try:
cache_file = _get_history_cache_file_path(channel_id)
# Создаем метаданные кеша
# Create cache metadata
cache_data = {
'timestamp': time.time(),
'limit': limit,
@@ -57,15 +57,15 @@ def _save_history_to_cache(channel_id: Union[str, int], messages: List[Message],
def _get_history_from_cache(channel_id: Union[str, int], limit: int, max_age_hours: int = 8) -> Optional[List[Message]]:
"""
Получает историю сообщений из кеша если они не старше указанного возраста и соответствуют лимиту
Retrieves message history from cache if not older than specified age and matches the limit
Args:
channel_id: ID или username канала
limit: Требуемый лимит сообщений
max_age_hours: Максимальный возраст кеша в часах (по умолчанию 8 час)
channel_id: Channel ID or username
limit: Required message limit
max_age_hours: Maximum cache age in hours (default 8 hours)
Returns:
Список сообщений или None если кеш не найден, устарел или лимит не соответствует
List of messages or None if cache not found, expired or limit doesn't match
"""
try:
cache_file = _get_history_cache_file_path(channel_id)
@@ -77,9 +77,9 @@ def _get_history_from_cache(channel_id: Union[str, int], limit: int, max_age_hou
with open(cache_file, 'rb') as f:
cache_data = pickle.load(f)
# Проверяем возраст кеша с добавлением случайности
# Check cache age with randomization
cache_age = time.time() - cache_data['timestamp']
# Добавляем случайность до 20% от max_age_seconds
# Add randomness up to 20% of max_age_seconds
random_factor = 1 - random.uniform(0, 0.2)
adjusted_max_age = max_age_hours * 3600 * random_factor
@@ -87,52 +87,47 @@ def _get_history_from_cache(channel_id: Union[str, int], limit: int, max_age_hou
logger.info(f"history_cache_expired: channel {channel_id}, limit {limit}, age {cache_age:.1f}s > adjusted max {adjusted_max_age:.1f}s (random factor: {random_factor:.2f})")
return None
# Проверяем соответствие лимита
# Check if limit matches
cached_limit = cache_data.get('limit', 0)
if cached_limit != limit:
logger.info(f"history_cache_limit_mismatch: channel {channel_id}, cached limit {cached_limit}, requested limit {limit}")
return None
# Восстанавливаем список сообщений из пикла
# Restore message list from pickle
messages = pickle.loads(cache_data['messages'])
logger.info(f"history_cache_hit: channel {channel_id}, limit {limit}, messages {len(messages)}, age {cache_age:.1f}s")
return messages
except Exception as e:
logger.error(f"history_cache_read_error: channel {channel_id}, limit {limit}, error {str(e)}")
# В случае ошибки чтения кеша лучше вернуть None и запросить свежие данные
# In case of cache read error, better return None and request fresh data
return None
async def cached_get_chat_history(client: Client, channel_id: Union[str, int], limit: int = 20) -> List[Message]:
"""
Получает историю сообщений чата с кешированием.
Gets chat message history with caching.
Args:
client: Pyrogram клиент
channel_id: ID или username канала
limit: Максимальное количество сообщений для получения
client: Pyrogram client
channel_id: Channel ID or username
limit: Maximum number of messages to retrieve
Returns:
Список сообщений, как и оригинальный client.get_chat_history()
List of messages, same as original client.get_chat_history()
"""
# Пробуем получить из кеша
cached_messages = _get_history_from_cache(channel_id, limit)
if cached_messages is not None:
return cached_messages
# Если в кеше нет или кеш устарел, запрашиваем через API
try:
logger.info(f"history_cache_request: fetching fresh history for channel {channel_id}, limit {limit}")
messages = []
async for message in client.get_chat_history(channel_id, limit=limit):
messages.append(message)
# Сохраняем в кеш
_save_history_to_cache(channel_id, messages, limit)
return messages
except Exception as e:
logger.error(f"history_cache_request_error: channel {channel_id}, limit {limit}, error {str(e)}")
# Пробрасываем ошибку дальше, как и оригинальный метод
raise