diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-06-12 19:55:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-12 19:55:46 +0300 |
| commit | 80652326e6e5f9d193ead77e0bee62f981e79301 (patch) | |
| tree | ad7abe8b926ce550331ee0d17a476d1f5825e7c2 /src/services/vyos-configd | |
| parent | dcba87b2394b789c335b44856a8ae7bfea05353c (diff) | |
| parent | 2ef19495e1a2750330a5a520f41601202ca2b703 (diff) | |
| download | vyos-1x-80652326e6e5f9d193ead77e0bee62f981e79301.tar.gz vyos-1x-80652326e6e5f9d193ead77e0bee62f981e79301.zip | |
Merge pull request #4552 from jestabro/reset-section
T7488: add utility for automatic rollback of section on apply stage error
Diffstat (limited to 'src/services/vyos-configd')
| -rwxr-xr-x | src/services/vyos-configd | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/services/vyos-configd b/src/services/vyos-configd index 28acccd2c..c45d492f9 100755 --- a/src/services/vyos-configd +++ b/src/services/vyos-configd @@ -68,6 +68,7 @@ class Response(Enum): ERROR_COMMIT = 2 ERROR_DAEMON = 4 PASS = 8 + ERROR_COMMIT_APPLY = 16 vyos_conf_scripts_dir = directories['conf_mode'] @@ -142,8 +143,6 @@ def run_script(script_name, config, args) -> tuple[Response, str]: try: c = script.get_config(config) script.verify(c) - script.generate(c) - script.apply(c) except ConfigError as e: logger.error(e) return Response.ERROR_COMMIT, str(e) @@ -152,6 +151,17 @@ def run_script(script_name, config, args) -> tuple[Response, str]: logger.error(tb) return Response.ERROR_COMMIT, tb + try: + script.generate(c) + script.apply(c) + except ConfigError as e: + logger.error(e) + return Response.ERROR_COMMIT_APPLY, str(e) + except Exception: + tb = traceback.format_exc() + logger.error(tb) + return Response.ERROR_COMMIT_APPLY, tb + return Response.SUCCESS, '' |