@@ -155,14 +155,18 @@ def _multiline_to_list(s): | |||
| 155 | 155 | EMAIL_HOST = os.environ.get("DATATRACKER_EMAIL_HOST", "localhost") | |
| 156 | 156 | EMAIL_PORT = int(os.environ.get("DATATRACKER_EMAIL_PORT", "2025")) | |
| 157 | 157 | ||
| 158 | + _broker_url = os.environ.get("DATATRACKER_BROKER_URL", None) | ||
| 158 | 159 | _celery_password = os.environ.get("CELERY_PASSWORD", None) | |
| 159 | - if _celery_password is None: | ||
| 160 | - raise RuntimeError("CELERY_PASSWORD must be set") | ||
| 161 | - CELERY_BROKER_URL = "amqp://datatracker:{password}@{host}/{queue}".format( | ||
| 162 | - host=os.environ.get("RABBITMQ_HOSTNAME", "dt-rabbitmq"), | ||
| 163 | - password=_celery_password, | ||
| 164 | - queue=os.environ.get("RABBITMQ_QUEUE", "dt"), | ||
| 165 | - ) | ||
| 160 | + if _broker_url is not None: | ||
| 161 | + CELERY_BROKER_URL = _broker_url | ||
| 162 | + elif _celery_password is not None: | ||
| 163 | + CELERY_BROKER_URL = "amqp://datatracker:{password}@{host}/{queue}".format( | ||
| 164 | + host=os.environ.get("RABBITMQ_HOSTNAME", "dt-rabbitmq"), | ||
| 165 | + password=_celery_password, | ||
| 166 | + queue=os.environ.get("RABBITMQ_QUEUE", "dt"), | ||
| 167 | + ) | ||
| 168 | + else: | ||
| 169 | + raise RuntimeError("DATATRACKER_BROKER_URL or CELERY_PASSWORD must be set") | ||
| 166 | 170 | ||
| 167 | 171 | # mailarchive API key | |
| 168 | 172 | _mailing_list_archive_api_key = os.environ.get( | |
0 commit comments