netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-21 23:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure multiline variables from yaml config are lists

Browse source
This commit is contained in:
Orsiris de Jong 2023-05-04 11:31:01 +02:00
parent b8cc4962ae
commit b868b74125
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
npbackup/core/runner.py
View file

@ -61,6 +61,8 @@ def metric_writer(config_dict: dict, restic_result: bool, result_string: str):
prometheus_additional_labels = config_dict["prometheus"][
"additional_labels"
]
if not isinstance(prometheus_additional_labels, list):
prometheus_additional_labels = [prometheus_additional_labels]
except (KeyError, AttributeError):
prometheus_additional_labels = None
@ -69,10 +71,7 @@ def metric_writer(config_dict: dict, restic_result: bool, result_string: str):
[f'{key}="{value}"' for key, value in labels.items() if value]
)
try:
# Make sure we convert prometheus_additional_labels to list if only one label is given
if prometheus_additional_labels:
if not isinstance(prometheus_additional_labels, list):
prometheus_additional_labels = [prometheus_additional_labels]
for additional_label in prometheus_additional_labels:
label, value = additional_label.split("=")
label_string += ',{}="{}"'.format(label.strip(), value.strip())
@ -321,15 +320,14 @@ class NPBackupRunner:
try:
env_variables = self.config_dict["env"]["variables"]
if not isinstance(env_variables, list):
env_variables = [env_variables]
except KeyError:
env_variables = None
expanded_env_vars = {}
try:
if env_variables:
# Make sure we convert env_variables to list if only one label is given
if not isinstance(env_variables, list):
env_variables = [env_variables]
for env_variable in env_variables:
key, value = env_variable.split("=")
expanded_env_vars[key.strip()] = value.strip()
@ -438,10 +436,14 @@ class NPBackupRunner:
# MSWindows does not support one-file-system option
try:
exclude_patterns = self.config_dict["backup"]["exclude_patterns"]
if not isinstance(exclude_patterns, list):
exclude_patterns = [exclude_patterns]
except KeyError:
exclude_patterns = []
try:
exclude_files = self.config_dict["backup"]["exclude_files"]
if not isinstance(exclude_files, list):
exclude_files = [exclude_files]
except KeyError:
exclude_files = []
try: