GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

override

Browse Source
This commit is contained in:
Devaev Maxim
2019-06-26 21:31:53 +03:00
parent 8a40b1f062
commit 071fd62f41
8 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kvmd/apps/__init__.py
View File

@@ -108,6 +108,7 @@ def _init_config(config_path: str, sections: List[str], override_options: List[s
scheme = _get_config_scheme(sections)
try:
_merge_dicts(raw_config, build_raw_from_options(override_options))
_merge_dicts(raw_config, (raw_config.get("override") or {}))
config = make_config(raw_config, scheme)
if "kvmd" in sections:
@@ -143,6 +144,8 @@ def _merge_dicts(dest: Dict, src: Dict) -> None:
def _get_config_scheme(sections: List[str]) -> Dict:
scheme = {
"override": Option({}),
"logging": Option({}),
"kvmd": {