fix: optional ssl for kafka and optional tg user fields
This commit is contained in:
7
external/kafka/consumer.py
vendored
7
external/kafka/consumer.py
vendored
@@ -1,20 +1,19 @@
|
||||
from aiokafka import AIOKafkaConsumer
|
||||
from aiokafka.errors import KafkaConnectionError
|
||||
|
||||
from backend.config import KAFKA_URL, KAFKA_CONSUMER_TOPIC
|
||||
from backend.config import KAFKA_URL, KAFKA_CONSUMER_TOPIC, KAFKA_ENABLE_SSL
|
||||
from backend.session import session_maker
|
||||
from external.kafka.context import context
|
||||
from external.kafka.services.consumer_service import ConsumerService
|
||||
|
||||
|
||||
|
||||
async def consume_messages():
|
||||
consumer = AIOKafkaConsumer(
|
||||
KAFKA_CONSUMER_TOPIC,
|
||||
bootstrap_servers=KAFKA_URL,
|
||||
group_id='crm',
|
||||
security_protocol='SSL',
|
||||
ssl_context=context,
|
||||
security_protocol='SSL' if KAFKA_ENABLE_SSL else 'PLAINTEXT',
|
||||
ssl_context=context if KAFKA_ENABLE_SSL else None,
|
||||
)
|
||||
try:
|
||||
await consumer.start()
|
||||
|
||||
6
external/kafka/producer.py
vendored
6
external/kafka/producer.py
vendored
@@ -2,7 +2,7 @@ from typing import Optional
|
||||
|
||||
from aiokafka import AIOKafkaProducer
|
||||
|
||||
from backend.config import KAFKA_URL
|
||||
from backend.config import KAFKA_URL, KAFKA_ENABLE_SSL
|
||||
from external.kafka.context import context
|
||||
|
||||
_producer: Optional[AIOKafkaProducer] = None
|
||||
@@ -12,8 +12,8 @@ async def init_producer():
|
||||
global _producer
|
||||
_producer = AIOKafkaProducer(
|
||||
bootstrap_servers=KAFKA_URL,
|
||||
security_protocol='SSL',
|
||||
ssl_context=context,
|
||||
security_protocol='SSL' if KAFKA_ENABLE_SSL else 'PLAINTEXT',
|
||||
ssl_context=context if KAFKA_ENABLE_SSL else None,
|
||||
)
|
||||
|
||||
|
||||
|
||||
6
external/kafka/schemas/consumer.py
vendored
6
external/kafka/schemas/consumer.py
vendored
@@ -7,9 +7,9 @@ from schemas.base import OkMessageSchema, BaseSchema
|
||||
|
||||
class TelegramUserSchema(BaseSchema):
|
||||
id: int
|
||||
first_name: str
|
||||
last_name: str
|
||||
username: str
|
||||
first_name: Optional[str] = None
|
||||
last_name: Optional[str] = None
|
||||
username: Optional[str] = None
|
||||
|
||||
|
||||
class MessageFileSchema(BaseSchema):
|
||||
|
||||
Reference in New Issue
Block a user