From 041939a51ce8f44a30293e1a2f12e2cfdd186842 Mon Sep 17 00:00:00 2001
From: Maximilian Moser <maximilian.moser@tuwien.ac.at>
Date: Tue, 11 Feb 2025 20:47:29 +0100
Subject: [PATCH] Be more aggressive in overriding the BROKER_URL
* because Invenio-App-RDM sets a default value for that config item
mismatching our setup
---
invenio_config_tuw/startup/config.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/invenio_config_tuw/startup/config.py b/invenio_config_tuw/startup/config.py
index 3f90323..84271b9 100644
--- a/invenio_config_tuw/startup/config.py
+++ b/invenio_config_tuw/startup/config.py
@@ -116,12 +116,11 @@ def assemble_broker_uri_from_parts(app):
broker_user = _get_config(app, "BROKER_USER", default=rabbitmq_user)
broker_password = _get_config(app, "BROKER_PASSWORD", default=rabbitmq_password)
- if broker_url is None:
- if None not in [broker_protocol, broker_user, broker_password, broker_host]:
- broker_url = (
- f"{broker_protocol}://{broker_user}:{broker_password}@{broker_host}/"
- )
- else:
+ if None not in [broker_protocol, broker_user, broker_password, broker_host]:
+ broker_url = (
+ f"{broker_protocol}://{broker_user}:{broker_password}@{broker_host}/"
+ )
+ elif broker_url is None:
broker_url = "amqp://guest:guest@localhost:5672/"
# celery doesn't like having BROKER_HOST *and* the other values set
--
GitLab