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

Misc small bug fixes

Browse Source
This commit is contained in:
Brett Williams
2023-06-04 12:06:01 -05:00
parent fae30d3a6a
commit 54ec4e7838
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/client/dashboard_window.py
View File

@@ -191,7 +191,7 @@ class DashboardWindow:
import io import io
image_data = response.content image_data = response.content
image = Image.open(io.BytesIO(image_data)) image = Image.open(io.BytesIO(image_data))
if self.server_proxy.hostname == hostname: if self.server_proxy.hostname == hostname and job_id == self.selected_job_id():
self.set_image(image) self.set_image(image)
except Exception as e: except Exception as e:
logger.error(f"error fetching image: {e}") logger.error(f"error fetching image: {e}")

7
lib/render_workers/base_worker.py
View File

@@ -214,14 +214,12 @@ class BaseRenderWorker(Base):
self.is_finished = True self.is_finished = True
return return
duration = self.end_time - self.start_time
if return_code: if return_code:
message = f"{self.engine.name()} render failed with return_code {return_code} after {duration}" message = f"{self.engine.name()} render failed with return_code {return_code} after {self.time_elapsed()}"
logger.error(message) logger.error(message)
self.failed_attempts = self.failed_attempts + 1 self.failed_attempts = self.failed_attempts + 1
else: else:
message = f"{self.engine.name()} render completed successfully in {duration}" message = f"{self.engine.name()} render completed successfully in {self.time_elapsed()}"
logger.info(message) logger.info(message)
self.status = RenderStatus.COMPLETED self.status = RenderStatus.COMPLETED
@@ -322,6 +320,7 @@ class BaseRenderWorker(Base):
'client': self.client, 'client': self.client,
'date_created': self.date_created, 'date_created': self.date_created,
'start_time': self.start_time, 'start_time': self.start_time,
'end_time': self.end_time,
'status': self.status.value, 'status': self.status.value,
'time_elapsed': self.time_elapsed(), 'time_elapsed': self.time_elapsed(),
'file_hash': self.file_hash, 'file_hash': self.file_hash,

2
lib/server/server_proxy.py
View File

@@ -40,6 +40,8 @@ class RenderServerProxy:
req = self.request(payload, timeout) req = self.request(payload, timeout)
if req.ok and req.status_code == 200: if req.ok and req.status_code == 200:
return req.json() return req.json()
except json.JSONDecodeError as e:
logger.error(f"JSON decode error: {e}")
except requests.ConnectionError as e: except requests.ConnectionError as e:
logger.error(f"Connection error: {e}") logger.error(f"Connection error: {e}")
except Exception as e: except Exception as e: