Compare commits

..

11 Commits

Author SHA1 Message Date
ce550c31f4 Merge pull request 'fix' (#14) from queues into dev
Reviewed-on: #14
2024-11-25 00:01:04 +03:00
ba2f1bb768 Merge pull request 'queues' (#13) from queues into dev
Reviewed-on: #13
2024-11-24 23:55:59 +03:00
889a20609f Merge pull request 'fix' (#12) from queues into dev
Reviewed-on: #12
2024-11-23 22:32:00 +03:00
1c3d1566e5 Merge pull request 'fix' (#11) from queues into dev
Reviewed-on: #11
2024-11-23 22:27:17 +03:00
2b88479cec Merge pull request 'fix' (#10) from queues into dev
Reviewed-on: #10
2024-11-22 01:52:48 +03:00
7238d725dd Merge pull request 'fix' (#9) from queues into dev
Reviewed-on: #9
2024-11-22 01:48:32 +03:00
4a3fa3c2ab Merge pull request 'fix' (#8) from queues into dev
Reviewed-on: #8
2024-11-17 23:08:08 +03:00
45e1c0fe8a Merge pull request 'fix' (#7) from queues into dev
Reviewed-on: #7
2024-11-17 23:03:48 +03:00
989f7026ad Merge pull request 'fix' (#6) from queues into dev
Reviewed-on: #6
2024-11-17 22:58:40 +03:00
90378be7c5 Merge pull request 'queues' (#5) from queues into dev
Reviewed-on: #5
2024-11-17 22:56:27 +03:00
95e4f5e8da Merge pull request 'deploy' (#2) from master into dev
Reviewed-on: #2
2024-10-11 07:05:29 +03:00
2 changed files with 8 additions and 11 deletions

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))

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):