brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve performance of job status updates through caching hashes

Browse Source
This commit is contained in:
Brett Williams
2023-06-03 16:59:01 -05:00
parent 7dc7f17f83
commit a9257a6bf5
4 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/server/server_proxy.py
View File

@@ -1,3 +1,4 @@
import logging
import os
import json
import requests
@@ -10,13 +11,25 @@ status_colors = {RenderStatus.ERROR: "red", RenderStatus.CANCELLED: 'orange1', R
categories = [RenderStatus.RUNNING, RenderStatus.ERROR, RenderStatus.NOT_STARTED, RenderStatus.SCHEDULED,
RenderStatus.COMPLETED, RenderStatus.CANCELLED, RenderStatus.UNDEFINED]
logger = logging.getLogger()
class RenderServerProxy:
def __init__(self, hostname=None, server_port="8080"):
self.hostname = hostname
self._hostname = hostname
self.port = server_port
self.fetched_status_data = None
self.__jobs_cache_token = None
@property
def hostname(self):
return self._hostname
@hostname.setter
def hostname(self, value):
self._hostname = value
self.__jobs_cache_token = None
def connect(self):
status = self.request_data('status')
@@ -25,24 +38,29 @@ class RenderServerProxy:
def request_data(self, payload, timeout=5):
try:
req = self.request(payload, timeout)
if req.ok:
if req.ok and req.status_code == 200:
return req.json()
except requests.ConnectionError as e:
logger.error(f"Connection error: {e}")
except Exception as e:
pass
logger.exception(f"Uncaught exception: {e}")
return None
def request(self, payload, timeout=5):
return requests.get(f'http://{self.hostname}:{self.port}/api/{payload}', timeout=timeout)
def get_jobs(self, timeout=5):
all_jobs = self.request_data('jobs', timeout=timeout)
if all_jobs is not None:
url = f'jobs?token={self.__jobs_cache_token}' if self.__jobs_cache_token else 'jobs'
status_result = self.request_data(url, timeout=timeout)
all_jobs = None
if status_result is not None:
sorted_jobs = []
for status_category in categories:
found_jobs = [x for x in all_jobs if x['status'] == status_category.value]
found_jobs = [x for x in status_result['jobs'] if x['status'] == status_category.value]
if found_jobs:
sorted_jobs.extend(found_jobs)
all_jobs = sorted_jobs
self.__jobs_cache_token = status_result['token']
return all_jobs
def get_data(self, timeout=5):