self/botalka
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#19) from master into prod

Browse Source 
Reviewed-on: #19
This commit is contained in:
emmatveev 2024-11-28 23:14:36 +03:00
commit cab8e15ba8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemons/poll.py
View File

@ -10,6 +10,7 @@ from utils import queues
class Daemon(base.Daemon): class Daemon(base.Daemon):
def __init__(self): def __init__(self):
self.telegram_bots: dict[str, dict[str, telebot.TeleBot|None]] = {} self.telegram_bots: dict[str, dict[str, telebot.TeleBot|None]] = {}
self.threads: dict[str, dict[str, threading.Thread|None]] = {}
def execute(self): def execute(self):
while True: while True:
@ -17,18 +18,21 @@ class Daemon(base.Daemon):
for project_name, project in bots.items(): for project_name, project in bots.items():
if project_name not in self.telegram_bots: if project_name not in self.telegram_bots:
self.telegram_bots[project_name] = {} self.telegram_bots[project_name] = {}
self.threads[project_name] = {}
for bot_name, bot_info in project.items(): for bot_name, bot_info in project.items():
if bot_name not in self.telegram_bots[project_name]: if bot_name not in self.telegram_bots[project_name]:
self.telegram_bots[project_name][bot_name] = None self.telegram_bots[project_name][bot_name] = None
self.threads[project_name][bot_name] = None
bot = self.telegram_bots[project_name][bot_name] bot = self.telegram_bots[project_name][bot_name]
if bot_info.get('poll_enabled'): if bot_info.get('poll_enabled'):
if bot is not None: if bot is not None and self.threads[project_name][bot_name].is_alive():
print(f'process for {project_name} {bot_name} is alive') print(f'process for {project_name} {bot_name} is alive')
continue continue
print(f'starting process for {project_name} {bot_name}') print(f'starting process for {project_name} {bot_name}')
bot = telebot.TeleBot(bot_info['secrets']['telegram_token']) bot = telebot.TeleBot(bot_info['secrets']['telegram_token'])
self.start_polling(bot, bot_info['queue']) thread = self.start_polling(bot, bot_info['queue'])
self.telegram_bots[project_name][bot_name] = bot self.telegram_bots[project_name][bot_name] = bot
self.threads[project_name][bot_name] = thread
print(f'started process for {project_name} {bot_name}') print(f'started process for {project_name} {bot_name}')
else: else:
if bot is None: if bot is None:
@ -40,8 +44,10 @@ class Daemon(base.Daemon):
print(f'terminated process for {project_name} {bot_name}') print(f'terminated process for {project_name} {bot_name}')
time.sleep(10) time.sleep(10)
def start_polling(self, bot: telebot.TeleBot, queue: str): def start_polling(self, bot: telebot.TeleBot, queue: str) -> threading.Thread:
@bot.message_handler() @bot.message_handler()
def do_action(message: telebot.types.Message): def do_action(message: telebot.types.Message):
queues.set_task(queue, message.json, 1) queues.set_task(queue, message.json, 1)
threading.Thread(target=bot.polling).start() thread = threading.Thread(target=bot.polling)
thread.start()
return thread