Compare commits

..

No commits in common. "60474fb6b77ede2ce1cb054ea2bd19a2be249e46" and "8f47b7643ecafb0b18e7a6ba558ed202837e5d55" have entirely different histories.

4 changed files with 35 additions and 26 deletions

7
Makefile Normal file
View File

@ -0,0 +1,7 @@
gen:
pip install grpcio grpcio-tools
curl https://platform.sprinthub.ru/generator >> generator.py
python generator.py
rm generator.py
run:
python ./server.py

View File

@ -1,4 +1,6 @@
import os import os
import grpc
from queues import tasks_pb2_grpc
stage = os.getenv("STAGE", 'local') stage = os.getenv("STAGE", 'local')
@ -9,5 +11,8 @@ else:
class Daemon: class Daemon:
def __init__(self):
self.channel = grpc.insecure_channel(QUEUES_URL)
self.stub = tasks_pb2_grpc.TasksStub(channel=self.channel)
def execute(self): def execute(self):
raise NotImplemented raise NotImplemented

View File

@ -49,6 +49,7 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
def reply(self, text: str, chat_id: int, message_id: int): def reply(self, text: str, chat_id: int, message_id: int):
queues.set_task( queues.set_task(
self.stub,
'botalka_mailbox', 'botalka_mailbox',
{ {
'project': 'pizda-bot', 'project': 'pizda-bot',
@ -64,6 +65,7 @@ class Daemon(base.Daemon, queues.TasksHandlerMixin):
def send(self, text: str, chat_id: int): def send(self, text: str, chat_id: int):
queues.set_task( queues.set_task(
self.stub,
'botalka_mailbox', 'botalka_mailbox',
{ {
'project': 'pizda-bot', 'project': 'pizda-bot',

View File

@ -1,13 +1,8 @@
import os
import requests
import time import time
from queues import tasks_pb2_grpc
from queues import tasks_pb2
from google.protobuf import json_format
stage = os.getenv("STAGE", 'local')
if stage == 'local':
QUEUES_URL = 'http://localhost:1239'
else:
QUEUES_URL = 'http://queues:1239'
class QueuesException(Exception): class QueuesException(Exception):
@ -17,22 +12,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: tasks_pb2.TakeResponse = self.stub.Take(tasks_pb2.TakeRequest(queue=self.queue_name))
task = response.get('task') task = response.task
if not task: if not task:
time.sleep(0.2) if response.retry_after:
time.sleep(response.retry_after)
continue continue
try: try:
self.process(task['payload']) payload = json_format.MessageToDict(task.payload)
self.process(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={task.id}, payload={payload}, exc={exc}')
continue continue
try: try:
resp = requests.post(f'{QUEUES_URL}/api/v1/finish', json={'id': task['id']}) self.stub.Finish(tasks_pb2.FinishRequest(id=task.id))
if resp.status_code != 202:
raise QueuesException
except: except:
print(f'Failed to finish task id={task["id"]}') print(f'Failed to finish task id={task.id}')
@property @property
def queue_name(self): def queue_name(self):
@ -41,12 +36,12 @@ class TasksHandlerMixin:
def process(self, payload): def process(self, payload):
raise NotImplemented raise NotImplemented
def set_task(stub: tasks_pb2_grpc.TasksStub, queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None):
def set_task(queue_name: str, payload: dict, seconds_to_execute: int, delay: int|None = None): stub.Put(
resp = requests.post(f'{QUEUES_URL}/api/v1/put', headers={'queue': queue_name}, json={ tasks_pb2.PutRequest(
'payload': payload, queue=queue_name,
'seconds_to_execute': seconds_to_execute, seconds_to_execute=seconds_to_execute,
'delay': delay, delay=delay,
}) payload=payload
if resp.status_code != 202: )
raise QueuesException )