Skip to content
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.

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

Server status - Rabbit MQ and Flower links fixed #1144

Merged
merged 1 commit into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/templates/pages/server_status.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ <h1>Monitor queues</h1>
<div id="external_monitors" class="ui two column grid">
<div class="column">
<div class="ui fluid card">
<a class="image" href="//{{ RABBITMQ_MANAGEMENT_URL }}" target="_blank">
<a class="image" href="{{ RABBITMQ_MANAGEMENT_URL}}" target="_blank">
<img class="ui large image" src="/static/img/RabbitMQ.png">
</a>
<div class="content">
<a class="header" href="//{{ RABBITMQ_MANAGEMENT_URL }}" target="_blank">RabbitMQ</a>
<a class="header" href="{{ RABBITMQ_MANAGEMENT_URL }}" target="_blank">RabbitMQ</a>
<div class="meta">
This page allows admins to view connections, queued messages, message rates, channels,
exchanges, and other administrative features relating to RabbitMQ e.g. Creating users,
Expand All @@ -76,11 +76,11 @@ <h1>Monitor queues</h1>
</div>
<div class="column">
<div class="ui fluid card">
<a class="image" href="//{{ FLOWER_URL }}" target="_blank">
<a class="image" href="{{ FLOWER_URL }}" target="_blank">
<img class="ui large image" src="/static/img/Flower.png">
</a>
<div class="content">
<a class="header" href="//{{ FLOWER_URL }}" target="_blank">Flower</a>
<a class="header" href="{{ FLOWER_URL }}" target="_blank">Flower</a>
<div class="meta">
Flower is a powerful web-based Celery monitoring tool designed to keep track of our
tasks.
Expand Down
4 changes: 2 additions & 2 deletions src/utils/context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ def common_settings(request):
return {
'STORAGE_TYPE': settings.STORAGE_TYPE,
'USER_JSON_DATA': json.dumps(user_json_data),
'RABBITMQ_MANAGEMENT_URL': f"{settings.RABBITMQ_HOST}:{settings.RABBITMQ_MANAGEMENT_PORT}",
'FLOWER_URL': f"{settings.FLOWER_HOST}:{settings.FLOWER_PUBLIC_PORT}",
'RABBITMQ_MANAGEMENT_URL': f"{settings.SITE_DOMAIN}:{settings.RABBITMQ_MANAGEMENT_PORT}",
'FLOWER_URL': f"{settings.SITE_DOMAIN}:{settings.FLOWER_PUBLIC_PORT}",
}