Fix timeout extension by querying database directly for progress instead of using web.py

parent 04e2efe9
...@@ -815,9 +815,9 @@ class ClusterMaster: ...@@ -815,9 +815,9 @@ class ClusterMaster:
elif response and response.msg_type == 'result_pending': elif response and response.msg_type == 'result_pending':
# Check if we have recent progress to extend timeout # Check if we have recent progress to extend timeout
from .web import get_progress from .database import get_queue_by_job_id
progress_response = get_progress(job_id) job = get_queue_by_job_id(job_id)
if progress_response and 'progress' in progress_response: if job and job.get('progress', 0) > 0:
has_progress = True has_progress = True
last_progress_time = time.time() last_progress_time = time.time()
# Extend timeout when progress is active # Extend timeout when progress is active
......
...@@ -90,6 +90,7 @@ def send_to_backend(msg_type: str, data: dict) -> str: ...@@ -90,6 +90,7 @@ def send_to_backend(msg_type: str, data: dict) -> str:
def get_progress(job_id: str) -> dict: def get_progress(job_id: str) -> dict:
"""Get progress for a job.""" """Get progress for a job."""
try: try:
comm.connect()
# Send get_progress request to backend # Send get_progress request to backend
progress_msg = Message('get_progress', str(uuid.uuid4()), {'job_id': job_id}) progress_msg = Message('get_progress', str(uuid.uuid4()), {'job_id': job_id})
comm.send_message(progress_msg) comm.send_message(progress_msg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment