diff --git a/daemons/poll.py b/daemons/poll.py index f928514..978bae4 100644 --- a/daemons/poll.py +++ b/daemons/poll.py @@ -1,4 +1,3 @@ -import multiprocessing import telebot import threading import time @@ -10,7 +9,8 @@ from utils import queues class Daemon(base.Daemon): def __init__(self): - self.telegram_bots: dict[str, dict[str, multiprocessing.Process|None]] = {} + self.telegram_bots: dict[str, dict[str, telebot.TeleBot|None]] = {} + self.threads: dict[str, dict[str, threading.Thread|None]] = {} def execute(self): while True: @@ -18,31 +18,36 @@ class Daemon(base.Daemon): for project_name, project in bots.items(): if project_name not in self.telegram_bots: self.telegram_bots[project_name] = {} + self.threads[project_name] = {} for bot_name, bot_info in project.items(): if bot_name not in self.telegram_bots[project_name]: self.telegram_bots[project_name][bot_name] = None + self.threads[project_name][bot_name] = None bot = self.telegram_bots[project_name][bot_name] if bot_info.get('poll_enabled'): - if bot is not None and bot.is_alive: + if bot is not None and self.threads[project_name][bot_name].is_alive(): print(f'process for {project_name} {bot_name} is alive') continue print(f'starting process for {project_name} {bot_name}') bot = telebot.TeleBot(bot_info['secrets']['telegram_token']) - self.start_polling(bot, bot_info['queue'], project_name, bot_name) + thread = self.start_polling(bot, bot_info['queue']) + self.telegram_bots[project_name][bot_name] = bot + self.threads[project_name][bot_name] = thread print(f'started process for {project_name} {bot_name}') else: if bot is None: print(f'process for {project_name} {bot_name} is not alive') continue print(f'terminating process for {project_name} {bot_name}') - bot.terminate() + bot.stop_bot() self.telegram_bots[project_name][bot_name] = None print(f'terminated process for {project_name} {bot_name}') time.sleep(10) - def start_polling(self, bot: telebot.TeleBot, queue: str, project_name: str, bot_name: str): + def start_polling(self, bot: telebot.TeleBot, queue: str) -> threading.Thread: @bot.message_handler() def do_action(message: telebot.types.Message): queues.set_task(queue, message.json, 1) - process = multiprocessing.Process(target=bot.polling) - self.telegram_bots[project_name][bot_name] = process + thread = threading.Thread(target=bot.polling) + thread.start() + return thread