self/ruz-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: self:d2247054e8aafbe8b7cb90870d71866099a559d0
Branches Tags
self:master
self:prod
self:dev
self:queues
..
compare: self:ce550c31f4e39e0b805972e937f5720d7d88b702
Branches Tags
self:prod
self:master
self:dev
self:queues

No commits in common. "d2247054e8aafbe8b7cb90870d71866099a559d0" and "ce550c31f4e39e0b805972e937f5720d7d88b702" have entirely different histories.
d2247054e8 ... ce550c31f4

2 changed files with 8 additions and 11 deletions
Show Stats Expand all files Collapse all files

3
daemons/mailbox.py
View File

@ -25,7 +25,4 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
reply_markup = payload.get('reply_markup') reply_markup = payload.get('reply_markup')
if reply_markup: if reply_markup:
body['reply_markup'] = reply_markup body['reply_markup'] = reply_markup
try:
self.bot.send_message(**body, parse_mode='Markdown') self.bot.send_message(**body, parse_mode='Markdown')
except Exception as exc:
print('Error', str(exc))

14
utils/queues.py
View File

@ -17,22 +17,22 @@ class QueuesException(Exception):
class TasksHandlerMixin: class TasksHandlerMixin:
def poll(self): def poll(self):
while True: while True:
response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name}).json() response = requests.get(f'{QUEUES_URL}/api/v1/take', headers={'queue': self.queue_name})
task = response.get('task') if response.status_code == 404:
if not task:
time.sleep(0.2) time.sleep(0.2)
continue continue
data = response.json()
try: try:
self.process(task['payload']) self.process(data['payload'])
except Exception as exc: except Exception as exc:
print(f'Error processing message id={task["id"]}, payload={task["payload"]}, exc={exc}') print(f'Error processing message id={data["id"]}, payload={data["payload"]}, exc={exc}')
continue continue
try: try:
resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']}) resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': data['id']})
if resp.status_code != 202: if resp.status_code != 202:
raise QueuesException raise QueuesException
except: except:
print(f'Failed to finish task id={task["id"]}') print(f'Failed to finish task id={data["id"]}')
@property @property
def queue_name(self): def queue_name(self):