netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-02-24 14:35:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

Improve variable evaluation in config dict

Browse source
This commit is contained in:
Orsiris de Jong 2023-05-29 19:33:39 +02:00
parent 3228f0fad3
commit 183d72e98f
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
npbackup/configuration.py
View file

@ -270,25 +270,28 @@ def evaluate_variables(config_dict: dict, value: str) -> str:
or "${HOSTNAME}" in value
) and count <= maxcount:
value = value.replace("${HOSTNAME}", platform.node())
try:
value = value.replace(
"${MACHINE_ID}", config_dict["identity"]["machine_id"]
)
new_value = config_dict["identity"]["machine_id"]
# TypeError may happen if config_dict[x][y] is None
except (KeyError, TypeError):
pass
new_value = None
value = value.replace("${MACHINE_ID}", new_value if new_value else "")
try:
value = value.replace(
"${MACHINE_GROUP}", config_dict["identity"]["machine_group"]
)
new_value = config_dict["identity"]["machine_group"]
# TypeError may happen if config_dict[x][y] is None
except (KeyError, TypeError):
pass
new_value = None
value = value.replace("${MACHINE_GROUP}", new_value if new_value else "")
try:
value = value.replace(
"${BACKUP_JOB}", config_dict["prometheus"]["backup_job"]
)
new_value = config_dict["prometheus"]["backup_job"]
# TypeError may happen if config_dict[x][y] is None
except (KeyError, TypeError):
pass
new_value = None
value = value.replace("${BACKUP_JOB}", new_value if new_value else "")
count += 1
return value