If problems found with configuration file, show which file was read

But only if it wasn't explicitly specified with -f/--config-file.
This commit is contained in:
Ian Barwick
2017-09-21 09:54:12 +09:00
parent ef5fc1832a
commit 9a6580a312
2 changed files with 6 additions and 4 deletions

View File

@@ -77,14 +77,13 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
{
log_error(_("provided configuration file \"%s\" not found: %s"),
config_file,
strerror(errno)
);
strerror(errno));
exit(ERR_BAD_CONFIG);
}
if (verbose == true)
{
log_notice(_("using configuration file \"%s\""), config_file);
log_notice(_("using provided configuration file \"%s\""), config_file);
}
config_file_provided = true;
@@ -1218,6 +1217,9 @@ exit_with_config_file_errors(ItemList *config_errors, ItemList *config_warnings,
item_list_free(config_warnings);
}
if (config_file_provided == false)
log_detail(_("configuration file is: \"%s\""), config_file_path);
exit(ERR_BAD_CONFIG);
}