github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
configfile.c
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"), log_error(_("provided configuration file \"%s\" not found: %s"),
config_file, config_file,
strerror(errno) strerror(errno));
);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (verbose == true) if (verbose == true)
{ {
log_notice(_("using configuration file \"%s\""), config_file); log_notice(_("using provided configuration file \"%s\""), config_file);
} }
config_file_provided = true; config_file_provided = true;
@@ -1218,6 +1217,9 @@ exit_with_config_file_errors(ItemList *config_errors, ItemList *config_warnings,
item_list_free(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); exit(ERR_BAD_CONFIG);
} }

2
repmgr-client.c
View File

@@ -1755,13 +1755,13 @@ do_help(void)
printf(_("General options:\n")); printf(_("General options:\n"));
printf(_(" -?, --help show this help, then exit\n")); printf(_(" -?, --help show this help, then exit\n"));
printf(_(" -V, --version output version information, then exit\n")); printf(_(" -V, --version output version information, then exit\n"));
puts(""); puts("");
printf(_("General configuration options:\n")); printf(_("General configuration options:\n"));
printf(_(" -b, --pg_bindir=PATH path to PostgreSQL binaries (optional)\n")); printf(_(" -b, --pg_bindir=PATH path to PostgreSQL binaries (optional)\n"));
printf(_(" -f, --config-file=PATH path to the repmgr configuration file\n")); printf(_(" -f, --config-file=PATH path to the repmgr configuration file\n"));
printf(_(" -F, --force force potentially dangerous operations to happen\n")); printf(_(" -F, --force force potentially dangerous operations to happen\n"));
puts("");
printf(_("Database connection options:\n")); printf(_("Database connection options:\n"));
printf(_(" -d, --dbname=DBNAME database to connect to (default: ")); printf(_(" -d, --dbname=DBNAME database to connect to (default: "));