From 23aaaf68b187973b9f440350a094c3345256de8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20K=C3=B6ssler?= Date: Tue, 23 Jul 2024 18:34:50 +0200 Subject: [PATCH] refactor: simplify rabbitmq config --- pyinfra/examples.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pyinfra/examples.py b/pyinfra/examples.py index 6ad1fa8..68abe5e 100644 --- a/pyinfra/examples.py +++ b/pyinfra/examples.py @@ -19,24 +19,6 @@ from pyinfra.webserver.utils import ( ) -def get_rabbitmq_config(settings: Dynaconf): - return RabbitMQConfig( - host=settings.rabbitmq.host, - port=settings.rabbitmq.port, - username=settings.rabbitmq.username, - password=settings.rabbitmq.password, - heartbeat=settings.rabbitmq.heartbeat, - input_queue_prefix=settings.rabbitmq.service_request_queue_prefix, - tenant_event_queue_suffix=settings.rabbitmq.tenant_event_queue_suffix, - tenant_exchange_name=settings.rabbitmq.tenant_exchange_name, - service_request_exchange_name=settings.rabbitmq.service_request_exchange_name, - service_response_exchange_name=settings.rabbitmq.service_response_exchange_name, - service_dead_letter_queue_name=settings.rabbitmq.service_dlq_name, - queue_expiration_time=settings.rabbitmq.queue_expiration_time, - pod_name=settings.kubernetes.pod_name, - ) - - def start_standard_queue_consumer( callback: Callback, settings: Dynaconf, @@ -67,7 +49,21 @@ def start_standard_queue_consumer( instrument_app(app) if settings.concurrency.enabled: - config = get_rabbitmq_config(settings) + config = RabbitMQConfig( + host=settings.rabbitmq.host, + port=settings.rabbitmq.port, + username=settings.rabbitmq.username, + password=settings.rabbitmq.password, + heartbeat=settings.rabbitmq.heartbeat, + input_queue_prefix=settings.rabbitmq.service_request_queue_prefix, + tenant_event_queue_suffix=settings.rabbitmq.tenant_event_queue_suffix, + tenant_exchange_name=settings.rabbitmq.tenant_exchange_name, + service_request_exchange_name=settings.rabbitmq.service_request_exchange_name, + service_response_exchange_name=settings.rabbitmq.service_response_exchange_name, + service_dead_letter_queue_name=settings.rabbitmq.service_dlq_name, + queue_expiration_time=settings.rabbitmq.queue_expiration_time, + pod_name=settings.kubernetes.pod_name, + ) manager = AsyncQueueManager( config=config, tenant_service_url=settings.storage.tenant_server.endpoint, message_processor=callback )