From 2763a0c97f24cd21a160e9cdee769c14c64d4a1e Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Sat, 10 Jun 2023 16:07:58 -0500 Subject: [PATCH] Fix hostname issue on machines without ".local" in hostname and handle missed TimeOut exception --- lib/server/job_server.py | 3 ++- lib/server/server_proxy.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/server/job_server.py b/lib/server/job_server.py index f506a90..14124ad 100755 --- a/lib/server/job_server.py +++ b/lib/server/job_server.py @@ -542,7 +542,8 @@ def start_server(background_thread=False): server.config['MAX_CONTENT_PATH'] = config['max_content_path'] # Get hostname and render clients - RenderQueue.hostname = socket.gethostname() + local_hostname = socket.gethostname() + RenderQueue.hostname = local_hostname + (".local" if not local_hostname.endswith(".local") else "") server.config['HOSTNAME'] = RenderQueue.hostname # disable most Flask logging diff --git a/lib/server/server_proxy.py b/lib/server/server_proxy.py index 051fa8a..d57a7d8 100644 --- a/lib/server/server_proxy.py +++ b/lib/server/server_proxy.py @@ -64,8 +64,11 @@ class RenderServerProxy: return req.json() except json.JSONDecodeError as e: logger.debug(f"JSON decode error: {e}") + except requests.ReadTimeout as e: + logger.warning(f"Timed out: {e}") + self.__offline_flags = self.__offline_flags + 1 except requests.ConnectionError as e: - logger.error(f"Connection error: {e}") + logger.warning(f"Connection error: {e}") self.__offline_flags = self.__offline_flags + 1 except Exception as e: logger.exception(f"Uncaught exception: {e}")