From 3328853bd01b40eaece7047194c3ed1727e845f6 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 21 Apr 2025 15:56:19 -0700 Subject: [PATCH] Fix connection url --- app/assets/javascripts/socketio.js | 3 ++- app/main/views/jobs.py | 5 ++++- app/templates/views/jobs/job.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/socketio.js b/app/assets/javascripts/socketio.js index 9637d412f..46d18c7d4 100644 --- a/app/assets/javascripts/socketio.js +++ b/app/assets/javascripts/socketio.js @@ -13,11 +13,12 @@ document.addEventListener('DOMContentLoaded', function () { const jobEl = document.querySelector('[data-job-id]'); const jobId = jobEl?.dataset?.jobId; const featureEnabled = jobEl?.dataset?.feature === 'true'; + const apiHost = jobEl?.dataset?.host; if (!jobId) return; if (featureEnabled) { - const socket = io('http://localhost:6011'); + const socket = io(apiHost); socket.on('connect', () => { socket.emit('join', { room: `job-${jobId}` }); diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 320d57a39..e2cd4c7ce 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +import os from functools import partial from flask import ( @@ -58,8 +58,11 @@ def view_job(service_id, job_id): filter_args = parse_filter_args(request.args) filter_args["status"] = set_status_filters(filter_args) + api_host_name = os.environ.get('API_HOST_NAME') + return render_template( "views/jobs/job.html", + api_host_name=api_host_name, FEATURE_SOCKET_ENABLED=current_app.config["FEATURE_SOCKET_ENABLED"], job=job, status=request.args.get("status", ""), diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html index affb49af6..cd8e9267f 100644 --- a/app/templates/views/jobs/job.html +++ b/app/templates/views/jobs/job.html @@ -11,7 +11,7 @@ {% block maincolumn_content %} {{ page_header("Message status") }} -
+
{% if not job.finished_processing %}