Skip to content

Fix logging and web config getting overwritten when using config diretory #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LasseR15 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix logging and web config getting overwritten when using config diretory #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions yacron/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,13 @@ def parse_config_file(
def parse_config(config_arg: str) -> YacronConfig:
jobs = []
config_errors = {}

web_config = None
web_config_source_fname = None

logging_config = None
logging_config_source_fname = None

if os.path.isdir(config_arg):
for direntry in os.scandir(config_arg):
base, ext = os.path.splitext(direntry.name)
Expand All @@ -516,18 +521,32 @@ def parse_config(config_arg: str) -> YacronConfig:
web_config_source_fname, direntry.path
)
)
if config.logging_config is not None:
if logging_config is None:
logging_config = config.logging_config
logging_config_source_fname = direntry.path
else:
raise ConfigError(
"Multiple 'logging' configurations found: "
"first in {}, now in {}".format(
logging_config_source_fname, direntry.path
)
)
else:
try:
config = parse_config_file(config_arg)
logging_config = config.logging_config
web_config = config.web_config
except OSError as ex:
config_errors[config_arg] = str(ex)
else:
jobs.extend(config.jobs)
if config_errors:
raise ConfigError("\n---".join(config_errors.values()))

return YacronConfig(
jobs=jobs,
web_config=config.web_config,
job_defaults=config.job_defaults,
logging_config=config.logging_config,
web_config=web_config,
logging_config=logging_config,
)