vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-15 22:51:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Override init fix of schedules

Browse Source
This commit is contained in:
jokob-sk
2024-12-17 22:46:31 +11:00
parent 48f86e91f7
commit 4976324c50
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/initialise.py
+9 -2
View File
@@ -48,7 +48,10 @@ def ccd(key, default, config_dir, name, inputtype, options, group, events=None,
# Single quotes might break SQL queries, replacing them # Single quotes might break SQL queries, replacing them
if inputtype == 'text': if inputtype == 'text':
result = result.replace('\'', "{s-quote}") result = result.replace('\'', "{s-quote}")
# Add to config_dir if overridden by environment
if overriddenByEnv == 1:
config_dir[key] = result
# Create the tuples # Create the tuples
sql_safe_tuple = (key, name, desc, str(inputtype), options, str(result), group, str(events), overriddenByEnv) sql_safe_tuple = (key, name, desc, str(inputtype), options, str(result), group, str(events), overriddenByEnv)
@@ -315,13 +318,17 @@ def importConfigs (db, all_plugins):
else: else:
mylog('debug', [f"[Config] File {app_conf_override_path} does not exist."]) mylog('debug', [f"[Config] File {app_conf_override_path} does not exist."])
# setup execution schedules AFTER OVERRIDE handling # setup execution schedules AFTER OVERRIDE handling
mylog('verbose', [f"[Config] c_d {c_d}"])
for plugin in all_plugins: for plugin in all_plugins:
# Setup schedules # Setup schedules
run_val = get_set_value_for_init(plugin, c_d, "RUN") run_val = get_set_value_for_init(plugin, c_d, "RUN")
run_sch = get_set_value_for_init(plugin, c_d, "RUN_SCHD") run_sch = get_set_value_for_init(plugin, c_d, "RUN_SCHD")
mylog('verbose', [f"[Config] pref {plugin["unique_prefix"]} run_val {run_val} run_sch {run_sch} "]) # mylog('verbose', [f"[Config] pref {plugin["unique_prefix"]} run_val {run_val} run_sch {run_sch} "])
if run_val == 'schedule': if run_val == 'schedule':
newSchedule = Cron(run_sch).schedule(start_date=datetime.datetime.now(conf.tz)) newSchedule = Cron(run_sch).schedule(start_date=datetime.datetime.now(conf.tz))