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

Clarify error message.

Browse Source 
Avoid implying there's a configuration file if none was provided.
This commit is contained in:
Ian Barwick
2015-02-10 10:08:49 +09:00
parent 94bc5bdf80
commit 21730899da
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repmgr.c
View File

@@ -133,7 +133,8 @@ main(int argc, char **argv)
int c, targ;
int action = NO_ACTION;
bool check_master_config = false;
bool wal_keep_segments_used = false;
bool wal_keep_segments_used = false;
bool config_file_parsed = false;
char *ptr = NULL;
progname = get_progname(argv[0]);
@@ -388,7 +389,7 @@ main(int argc, char **argv)
* however if available we'll parse it anyway for options like 'log_level',
* 'use_replication_slots' etc.
*/
parse_config(runtime_options.config_file, &options);
config_file_parsed = parse_config(runtime_options.config_file, &options);
/*
* Initialise pg_bindir - command line parameter will override
@@ -441,8 +442,16 @@ main(int argc, char **argv)
{
if (options.node == -1)
{
log_err(_("Node information is missing. "
"Check the configuration file.\n"));
if(config_file_parsed == true)
{
log_err(_("No node information was found. "
"Check the configuration file.\n"));
}
else
{
log_err(_("No node information was found. "
"Please supply a configuration file.\n"));
}
exit(ERR_BAD_CONFIG);
}
}