scheduler - only send /data folder if apis are present

This commit is contained in:
bunkerity 2022-06-27 14:02:38 +02:00
parent 7aa6852d3c
commit 6478512e48
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
1 changed files with 11 additions and 6 deletions

View File

@ -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 :