Skip to content

fix: Switch from Azure Service Bus to RabbitMQ for task queue #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dahagag merged 1 commit into from
Jun 1, 2026
Merged

fix: Switch from Azure Service Bus to RabbitMQ for task queue #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion docker/docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ x-shared-secret-environment:
HOST: 0.0.0.0
WEBAPP_PORT: 8080
LOKOLE_STORAGE_PROVIDER: AZURE_BLOBS
LOKOLE_QUEUE_BROKER_SCHEME: azureservicebus
CONNEXION_SPEC: dir:/app/opwen_email_server/swagger
CELERY_QUEUE_NAMES: all
TESTING_UI: "False"
Expand Down Expand Up @@ -44,3 +43,21 @@ services:
image: ascoderu/opwenserver_app:latest
command: ["/app/docker/app/run-celery.sh"]
<<: *shared-secret-environment
depends_on:
- rabbitmq

rabbitmq:
image: rabbitmq:management-alpine
environment:
# Use same creds from azure.env for convenience
RABBITMQ_DEFAULT_USER: ${LOKOLE_EMAIL_SERVER_QUEUES_SAS_NAME}
RABBITMQ_DEFAULT_PASS: ${LOKOLE_EMAIL_SERVER_QUEUES_SAS_KEY}
volumes:
- rabbitmq_data:/var/lib/rabbitmq
restart: always
# Optional: expose management UI
# ports:
# - 15672:15672

volumes:
rabbitmq_data:
7 changes: 6 additions & 1 deletion opwen_email_server/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from urllib.parse import quote

from environs import Env

env = Env()
Expand Down Expand Up @@ -65,6 +67,9 @@
QUEUE_BROKER_PASSWORD = env('LOKOLE_EMAIL_SERVER_QUEUES_SAS_KEY')
QUEUE_BROKER_HOST = env('LOKOLE_EMAIL_SERVER_QUEUES_NAMESPACE')
if env('LOKOLE_QUEUE_BROKER_SCHEME', ''):
QUEUE_BROKER = f"{QUEUE_BROKER_SCHEME}://{QUEUE_BROKER_USERNAME}:{QUEUE_BROKER_PASSWORD}@{QUEUE_BROKER_HOST}"
# URL-encode credentials to handle special characters
username = quote(QUEUE_BROKER_USERNAME, safe='')
password = quote(QUEUE_BROKER_PASSWORD, safe='')
QUEUE_BROKER = f"{QUEUE_BROKER_SCHEME}://{username}:{password}@{QUEUE_BROKER_HOST}"
else:
QUEUE_BROKER = env('LOKOLE_QUEUE_BROKER_URL', '')
Loading