From 90d5e9b7af8ff0e45c51e46f2ad6147cabbe80dd Mon Sep 17 00:00:00 2001
From: Brett Williams <blw1138@mac.com>
Date: Mon, 5 Aug 2024 10:57:56 -0500
Subject: [PATCH] Misc logging cleanup

---
 src/api/api_server.py                   |  7 +++++
 src/distributed_job_manager.py          |  4 +--
 src/engines/engine_manager.py           | 34 +++++++++++++++----------
 src/engines/ffmpeg/ffmpeg_downloader.py |  4 +--
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/api/api_server.py b/src/api/api_server.py
index 838e19d..a2ef762 100755
--- a/src/api/api_server.py
+++ b/src/api/api_server.py
@@ -498,6 +498,13 @@ def start_server():
             time.sleep(delay_sec)
 
     try:
+        Config.setup_config_dir()
+        Config.load_config(system_safe_path(os.path.join(Config.config_dir(), 'config.yaml')))
+
+        # suppress requests logging
+        logging.getLogger("requests").setLevel(logging.WARNING)
+        logging.getLogger("urllib3").setLevel(logging.WARNING)
+
         # get hostname
         local_hostname = socket.gethostname()
         local_hostname = local_hostname + (".local" if not local_hostname.endswith(".local") else "")
diff --git a/src/distributed_job_manager.py b/src/distributed_job_manager.py
index 014f6cf..c67ef40 100644
--- a/src/distributed_job_manager.py
+++ b/src/distributed_job_manager.py
@@ -222,14 +222,14 @@ class DistributedJobManager:
 
             for subjob_filename in subjob_files:
                 if subjob_filename not in local_files:
-                    logger.info(f"Missing file '{subjob_filename}' from {subjob_hostname}")
                     try:
+                        logger.debug(f"Downloading new file '{subjob_filename}' from {subjob_hostname}")
                         local_save_path = os.path.join(os.path.dirname(local_job.output_path), subjob_filename)
                         subjob_proxy.download_job_file(job_id=subjob_id, job_filename=subjob_filename,
                                                        save_path=local_save_path)
                         logger.debug(f'Downloaded successfully - {local_save_path}')
                     except Exception as e:
-                        logger.error(f"Error downloading file '{subjob_filename}': {e}")
+                        logger.error(f"Error downloading file '{subjob_filename}' from {subjob_hostname}: {e}")
         except Exception as e:
             logger.exception(f'Uncaught exception while trying to download from subjob: {e}')
 
diff --git a/src/engines/engine_manager.py b/src/engines/engine_manager.py
index b4de73d..f86df49 100644
--- a/src/engines/engine_manager.py
+++ b/src/engines/engine_manager.py
@@ -110,7 +110,7 @@ class EngineManager:
             return filtered[0]
         except IndexError:
             logger.error(f"Cannot find newest engine version for {engine}-{system_os}-{cpu}")
-            return None
+        return None
 
     @classmethod
     def is_version_downloaded(cls, engine, version, system_os=None, cpu=None):
@@ -172,12 +172,12 @@ class EngineManager:
 
         if background:
             return thread
-        else:
-            thread.join()
-            found_engine = cls.is_version_downloaded(engine, version, system_os, cpu)  # Check that engine downloaded
-            if not found_engine:
-                logger.error(f"Error downloading {engine}")
-            return found_engine
+
+        thread.join()
+        found_engine = cls.is_version_downloaded(engine, version, system_os, cpu)  # Check that engine downloaded
+        if not found_engine:
+            logger.error(f"Error downloading {engine}")
+        return found_engine
 
     @classmethod
     def delete_engine_download(cls, engine, version, system_os=None, cpu=None):
@@ -204,13 +204,19 @@ class EngineManager:
         def engine_update_task(engine_class):
             logger.debug(f"Checking for updates to {engine_class.name()}")
             latest_version = engine_class.downloader().find_most_recent_version()
-            if latest_version:
-                logger.debug(f"Latest version of {engine_class.name()} available: {latest_version.get('version')}")
-                if not cls.is_version_downloaded(engine_class.name(), latest_version.get('version')):
-                    logger.info(f"Downloading latest version of {engine_class.name()}...")
-                    cls.download_engine(engine=engine_class.name(), version=latest_version['version'], background=True)
-            else:
-                logger.warning(f"Unable to get check for updates for {engine.name()}")
+
+            if not latest_version:
+                logger.warning(f"Could not find most recent version of {engine.name()} to download")
+                return
+
+            version_num = latest_version.get('version')
+            if cls.is_version_downloaded(engine_class.name(), version_num):
+                logger.debug(f"Latest version of {engine_class.name()} ({version_num}) already downloaded")
+                return
+
+            # download the engine
+            logger.info(f"Downloading latest version of {engine_class.name()} ({version_num})...")
+            cls.download_engine(engine=engine_class.name(), version=version_num, background=True)
 
         logger.info(f"Checking for updates for render engines...")
         threads = []
diff --git a/src/engines/ffmpeg/ffmpeg_downloader.py b/src/engines/ffmpeg/ffmpeg_downloader.py
index 72e75cc..8f69c44 100644
--- a/src/engines/ffmpeg/ffmpeg_downloader.py
+++ b/src/engines/ffmpeg/ffmpeg_downloader.py
@@ -132,8 +132,8 @@ class FFMPEGDownloader(EngineDownloader):
             system_os = system_os or current_system_os()
             cpu = cpu or current_system_cpu()
             return cls.all_versions(system_os, cpu)[0]
-        except (IndexError, requests.exceptions.RequestException):
-            logger.error(f"Cannot get most recent version of ffmpeg")
+        except (IndexError, requests.exceptions.RequestException) as e:
+            logger.error(f"Cannot get most recent version of ffmpeg: {e}")
         return {}
 
     @classmethod