librewolf/bunkerized-nginx
4
0
Fork 1
mirror of https://github.com/bunkerity/bunkerized-nginx synced 2023-12-13 21:30:18 +01:00
Code Issues Projects Releases Wiki Activity

Handle changes more elegantly with the scheduler

Browse source
This commit is contained in:
Théophile Diot 2023-09-28 14:28:49 +01:00
parent 0f7df13df3
commit 4ec754143a
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/scheduler/main.py
View file

@ -470,6 +470,7 @@ if __name__ == "__main__":
FIRST_RUN = True
CONFIG_NEED_GENERATION = True
RUN_JOBS_ONCE = True
CHANGES = []
threads = []
@ -498,15 +499,16 @@ if __name__ == "__main__":
)
stop(1)
# Update the environment variables of the scheduler
SCHEDULER.env = env.copy() | environ.copy()
SCHEDULER.setup()
if RUN_JOBS_ONCE:
# Update the environment variables of the scheduler
SCHEDULER.env = env.copy() | environ.copy()
SCHEDULER.setup()
# Only run jobs once
if not SCHEDULER.run_once():
logger.error("At least one job in run_once() failed")
else:
logger.info("All jobs in run_once() were successful")
# Only run jobs once
if not SCHEDULER.run_once():
logger.error("At least one job in run_once() failed")
else:
logger.info("All jobs in run_once() were successful")
if CONFIG_NEED_GENERATION:
content = ""
@ -613,6 +615,7 @@ if __name__ == "__main__":
)
NEED_RELOAD = False
RUN_JOBS_ONCE = False
CONFIG_NEED_GENERATION = False
CONFIGS_NEED_GENERATION = False
PLUGINS_NEED_GENERATION = False
@ -675,6 +678,7 @@ if __name__ == "__main__":
)
PLUGINS_NEED_GENERATION = True
CONFIG_NEED_GENERATION = True
NEED_RELOAD = True
# check if the custom configs have changed since last time
@ -693,6 +697,7 @@ if __name__ == "__main__":
if changes["instances_changed"]:
logger.info("Instances changed, generating ...")
INSTANCES_NEED_GENERATION = True
CONFIG_NEED_GENERATION = True
NEED_RELOAD = True
FIRST_RUN = False
@ -718,6 +723,7 @@ if __name__ == "__main__":
CHANGES.append("config")
env = db.get_config()
env["DATABASE_URI"] = db.database_uri
RUN_JOBS_ONCE = True
if INSTANCES_NEED_GENERATION:
CHANGES.append("instances")