From 6478512e48bfe7fff6a737561a7824662218db15 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Mon, 27 Jun 2022 14:02:38 +0200 Subject: [PATCH] scheduler - only send /data folder if apis are present --- job/JobScheduler.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/job/JobScheduler.py b/job/JobScheduler.py index 1e97cfea..432c4122 100644 --- a/job/JobScheduler.py +++ b/job/JobScheduler.py @@ -53,16 +53,16 @@ class JobScheduler(ApiCaller) : proc = subprocess.run(["/usr/sbin/nginx", "-s", "reload"], stdin=subprocess.DEVNULL, stderr=subprocess.STDOUT, env=self.__env) reload = proc.returncode != 0 if reload : - log("SCHEDULER", "ℹ️", "Successfuly reloaded nginx (local)") + log("SCHEDULER", "ℹ️", "Successfuly reloaded nginx") else : - log("SCHEDULER", "❌", "Error while reloading nginx (local)") + log("SCHEDULER", "❌", "Error while reloading nginx") else : log("SCHEDULER", "ℹ️", "Reloading nginx ...") reload = self._send_to_apis("POST", "/reload") if reload : - log("SCHEDULER", "ℹ️", "Successfuly reloaded nginx (api)") + log("SCHEDULER", "ℹ️", "Successfuly reloaded nginx") else : - log("SCHEDULER", "❌", "Error while reloading nginx (api)") + log("SCHEDULER", "❌", "Error while reloading nginx") return reload def __gen_conf(self) : @@ -115,8 +115,13 @@ class JobScheduler(ApiCaller) : success = False if reload : try : - if not self._send_files("/data", "/data") : - success = False + if len(self._get_apis()) > 0 : + log("SCHEDULER", "ℹ️", "Sending /data folder ...") + if not self._send_files("/data", "/data") : + success = False + log("SCHEDULER", "❌", "Error while sending /data folder") + else : + log("SCHEDULER", "ℹ️", "Successfuly sent /data folder") if not self.__reload() : success = False except :