summaryrefslogtreecommitdiff
path: root/src/session.ml
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-11-23 15:10:01 -0600
committerJohn Estabrook <jestabro@vyos.io>2025-12-02 13:10:41 -0600
commitf28bad075bc46c95dd2e52037d6e52d1621d2a49 (patch)
tree25637740098ebb3edb896fd11ca6ff72bc2e91d3 /src/session.ml
parent46890b13b9e565b7b61d2c75ca92441cb7490f7f (diff)
downloadvyconf-f28bad075bc46c95dd2e52037d6e52d1621d2a49.tar.gz
vyconf-f28bad075bc46c95dd2e52037d6e52d1621d2a49.zip
T8032: add vyconfd handlers for config_unsaved
Diffstat (limited to 'src/session.ml')
-rw-r--r--src/session.ml16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/session.ml b/src/session.ml
index 248121d..478c423 100644
--- a/src/session.ml
+++ b/src/session.ml
@@ -379,6 +379,18 @@ let save w s file =
| Error e -> raise (Session_error (Printf.sprintf "Error saving config: %s" e))
| Ok () -> s
+let remove_file file =
+ if Sys.file_exists file then Sys.remove file
+
+let config_unsaved w s file id =
+ let tmp_save = Printf.sprintf "/tmp/config.running_%s" id in
+ let res =
+ try
+ let _ = save w s tmp_save in
+ not (Vyos1x.Util.file_compare ~ignore_line_prefix:"//" tmp_save file)
+ with Session_error _ -> true (* false positive on unlikely error *)
+ in remove_file tmp_save; res
+
let write_running_cache w =
(* alert exn Internal.write_internal:
[Internal.Write_error] caught
@@ -480,10 +492,6 @@ let get_config w s id =
in id
let cleanup_config w id =
- let remove_file file =
- if Sys.file_exists file then
- Sys.remove file
- in
let vc = w.vyconf_config in
let running_cache = Printf.sprintf "%s_%s" vc.running_cache id in
let session_cache = Printf.sprintf "%s_%s" vc.session_cache id in