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 1/2] 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
From 48222953d25bfbc9ed1822e11c23e3298d52b145 Mon Sep 17 00:00:00 2001
From: Maximilian Moser <maximilian.moser@tuwien.ac.at>
Date: Tue, 11 Feb 2025 20:48:54 +0100
Subject: [PATCH 2/2] Bump version to v2025.1.7
---
CHANGES.rst | 5 +++++
invenio_config_tuw/__init__.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index 6e2acd7..664e69b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,11 @@ Changes
=======
+Version 2025.1.7 (released 2025-02-11)
+
+- Override `BROKER_URL` more aggressively
+
+
Version 2025.1.6 (released 2025-02-11)
- Remove accidentally added MXID field from notification settings template
diff --git a/invenio_config_tuw/__init__.py b/invenio_config_tuw/__init__.py
index c4a33e0..a888db7 100644
--- a/invenio_config_tuw/__init__.py
+++ b/invenio_config_tuw/__init__.py
@@ -9,6 +9,6 @@
from .ext import InvenioConfigTUW
-__version__ = "2025.1.6"
+__version__ = "2025.1.7"
__all__ = ("__version__", "InvenioConfigTUW")
--
GitLab