hacker07/NeoTachyon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(updates,migration): skip sing-box reload when config unchanged (#54) and guard test service restart

Browse Source
This commit is contained in:
Dushnilin
2026-09-15 06:35:35 +03:00
parent 79710e84a8
commit bc0928c277
4 changed files with 178 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tachyon/files/usr/lib/components/updates.uc
+19 -14
View File
@@ -3096,20 +3096,23 @@ function reload_singbox_after_list_update() {
if (!singbox_runtime_success([ "init-config", "0", "1", "1" ]))
return false;
let sing_box_config_hash_after = file_md5(sing_box_config_path);
log_message("Rulesets updated on disk; reloading sing-box with new configuration", "info");
module_success([ DNS_FAILOVER_UC, "stop-runtime" ]);
module_success([ PRIORITY_UC, "stop-runtime" ]);
let ok = service_state_success([
"reload-sing-box-runtime",
sing_box_pid,
sing_box_config_hash_before,
sing_box_config_hash_after,
"1"
]);
module_success([ PRIORITY_UC, "start-runtime" ]);
module_success([ DNS_FAILOVER_UC, "start-runtime" ]);
write_current_reload_state_clean();
return ok;
if (sing_box_config_hash_before != sing_box_config_hash_after) {
log_message("Rulesets updated on disk; reloading sing-box with new configuration", "info");
module_success([ DNS_FAILOVER_UC, "stop-runtime" ]);
module_success([ PRIORITY_UC, "stop-runtime" ]);
let ok = service_state_success([
"reload-sing-box-runtime",
sing_box_pid,
sing_box_config_hash_before,
sing_box_config_hash_after,
"1"
]);
module_success([ PRIORITY_UC, "start-runtime" ]);
module_success([ DNS_FAILOVER_UC, "start-runtime" ]);
write_current_reload_state_clean();
return ok;
}
return true;
}
function list_update() {
@@ -3552,6 +3555,8 @@ else if (mode == "list-update-if-due")
list_update_if_due();
else if (mode == "stop-list-update")
stop_list_update();
else if (mode == "reload-singbox-after-list-update")
exit(reload_singbox_after_list_update() ? 0 : 1);
else if (mode == "list-update-due-status")
uci_list_update_due_status(ARGV[1], ARGV[2]);
else if (mode == "list-update-due-status-fixture")
tachyon/files/usr/lib/config/migration.uc
+3 -2
View File
@@ -2183,9 +2183,10 @@ function import_settings_cli(source_path) {
system("chmod 0600 " + shell_quote(target_config) + " 2>/dev/null");
print(" ✓ Configuration successfully migrated and verified.\n\n");
if (fs.stat("/etc/init.d/tachyon") != null) {
let is_system_config = (target_config == "/etc/config/" + CONFIG_NAME) && (getenv("TACHYON_CONFIG_FILE") == null || getenv("TACHYON_CONFIG_FILE") == ("/etc/config/" + CONFIG_NAME));
if (is_system_config && !bool_option(getenv("TACHYON_SKIP_RESTART"), false) && fs.stat("/etc/init.d/tachyon") != null) {
print("Restarting Tachyon service...\n");
system("/usr/bin/tachyon restart >/dev/null 2>&1");
system("/usr/bin/tachyon restart </dev/null >/dev/null 2>&1");
print(" ✓ Tachyon restarted with imported configuration.\n\n");
}