Skip to content

Support HTTPS RabbitMQ management endpoints #2492

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

Open
cjh1 wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −4
Open

Support HTTPS RabbitMQ management endpoints #2492

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
5 changes: 4 additions & 1 deletion src/utils/context_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ def common_settings(request):
'STORAGE_TYPE': settings.STORAGE_TYPE,
'MAX_EXECUTION_TIME_LIMIT': settings.MAX_EXECUTION_TIME_LIMIT,
'USER_JSON_DATA': json.dumps(user_json_data),
'RABBITMQ_MANAGEMENT_URL': f"http://{settings.DOMAIN_NAME}:{settings.RABBITMQ_MANAGEMENT_PORT}",
'RABBITMQ_MANAGEMENT_URL': (
f"{settings.RABBITMQ_SCHEME}://"
f"{settings.RABBITMQ_HOST}:{settings.RABBITMQ_MANAGEMENT_PORT}"
),
'FLOWER_URL': f"http://{settings.DOMAIN_NAME}:{settings.FLOWER_PUBLIC_PORT}",
'ENABLE_SIGN_UP': settings.ENABLE_SIGN_UP,
'ENABLE_SIGN_IN': settings.ENABLE_SIGN_IN,
Expand Down
12 changes: 9 additions & 3 deletions src/utils/worker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ def _rabbitmq_auth():


def _rabbitmq_base_url():
return f"http://{settings.RABBITMQ_HOST}:{settings.RABBITMQ_MANAGEMENT_PORT}/api"
return (
f"{settings.RABBITMQ_SCHEME}://"
f"{settings.RABBITMQ_HOST}:{settings.RABBITMQ_MANAGEMENT_PORT}/api"
)


def _build_vhost_to_source_map():
Expand Down Expand Up @@ -66,8 +69,11 @@ def fetch_compute_workers():
all_queues = _fetch_all_queues()
all_channels = _fetch_all_channels()
all_consumers = _fetch_all_consumers()
except Exception:
logger.exception("Failed to fetch RabbitMQ data")
except Exception as exc:
# Do not log the traceback here. requests carries the HTTP basic-auth
# tuple in its call locals, and traceback-rich logging can expose the
# RabbitMQ password.
logger.error("Failed to fetch RabbitMQ data: %s", type(exc).__name__)
return [], [], []

try:
Expand Down