diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 20:40:34 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
| commit | b62c2685af62ed8715fae71f94df7a2fe645bd64 (patch) | |
| tree | 5a27c8c422860481fc54a741f5c9957a24fbadc7 /src/conf_mode/system-logs.py | |
| parent | 4b9e52aa5b9728a89715bf1f7f54063aa3e7aaef (diff) | |
| download | vyos-1x-b62c2685af62ed8715fae71f94df7a2fe645bd64.tar.gz vyos-1x-b62c2685af62ed8715fae71f94df7a2fe645bd64.zip | |
T5434: use auto-defaults in system-logs.py
Diffstat (limited to 'src/conf_mode/system-logs.py')
| -rwxr-xr-x | src/conf_mode/system-logs.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/system-logs.py b/src/conf_mode/system-logs.py index 12145d641..8ad4875d4 100755 --- a/src/conf_mode/system-logs.py +++ b/src/conf_mode/system-logs.py @@ -19,11 +19,9 @@ from sys import exit from vyos import ConfigError from vyos import airbag from vyos.config import Config -from vyos.configdict import dict_merge from vyos.logger import syslog from vyos.template import render from vyos.utils.dict import dict_search -from vyos.xml import defaults airbag.enable() # path to logrotate configs @@ -38,11 +36,9 @@ def get_config(config=None): conf = Config() base = ['system', 'logs'] - default_values = defaults(base) - logs_config = conf.get_config_dict(base, - key_mangling=('-', '_'), - get_first_key=True) - logs_config = dict_merge(default_values, logs_config) + logs_config = conf.get_config_dict(base, key_mangling=('-', '_'), + get_first_key=True, + with_recursive_defaults=True) return logs_config |