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

Compare commits

base: self:2ee74e70ac49750c7c9a4b4b365637920c677ffc
Branches Tags
self:master
self:prod
self:metric
self:dev
..
compare: self:da9309223274ccf0ef3fdac443a6e70fbe56609f
Branches Tags
self:master
self:prod
self:metric
self:dev

No commits in common. "2ee74e70ac49750c7c9a4b4b365637920c677ffc" and "da9309223274ccf0ef3fdac443a6e70fbe56609f" have entirely different histories.
2ee74e70ac ... da93092232

1 changed files with 16 additions and 13 deletions
Show Stats Expand all files Collapse all files

29
daemons/poll.py
View File

@ -9,7 +9,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, tuple[telebot.TeleBot, threading.Thread]|None]] = {}
def execute(self): def execute(self):
while True: while True:
@ -20,28 +20,31 @@ class Daemon(base.Daemon):
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
bot = self.telegram_bots[project_name][bot_name] internal_bot_info = 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 internal_bot_info is not None:
print(f'process for {project_name} {bot_name} is alive') bot, thread = internal_bot_info
continue if thread.is_alive:
print(f'starting process for {project_name} {bot_name}') print(f'process for {project_name} {bot_name} is alive')
continue
bot = telebot.TeleBot(bot_info['secrets']['telegram_token']) bot = telebot.TeleBot(bot_info['secrets']['telegram_token'])
self.start_polling(bot, bot_info['queue']) thread = threading.Thread(target=self.start_polling, args=[bot, bot_info['queue']])
self.telegram_bots[project_name][bot_name] = bot print(f'starting process for {project_name} {bot_name}')
thread.start()
self.telegram_bots[project_name][bot_name] = (bot, 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 internal_bot_info is None or not internal_bot_info[1].is_alive:
print(f'process for {project_name} {bot_name} is not alive') print(f'process for {project_name} {bot_name} is not alive')
continue continue
print(f'terminating process for {project_name} {bot_name}') print(f'terminating process for {project_name} {bot_name}')
bot.stop_bot() internal_bot_info[0].stop_bot()
self.telegram_bots[project_name][bot_name] = None self.telegram_bots[project_name][bot_name] = None
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, queue):
@bot.message_handler() @bot.message_handler()
def do_action(message: telebot.types.Message): def do_action(message):
queues.set_task(queue, message.json, 1) queues.set_task(queue, message.json, 1)
threading.Thread(target=bot.polling).start() bot.polling()