github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 00:46:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Minor cleanup in repmgr-client.c

Browse Source
This commit is contained in:
Ian Barwick
2019-10-30 16:58:30 +09:00
parent 220ec7fc96
commit 25fb24eee4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repmgr-client.c
View File

@@ -293,8 +293,7 @@ main(int argc, char **argv)
* These are the standard database connection options; with * These are the standard database connection options; with
* the exception of -d/--dbname (which could be a conninfo * the exception of -d/--dbname (which could be a conninfo
* string) we'll also set these values in "source_conninfo" * string) we'll also set these values in "source_conninfo"
* (overwriting preset values from environment variables). XXX * (overwriting preset values from environment variables).
* check this is same as psql
*/ */
/* -d/--dbname */ /* -d/--dbname */
case 'd': case 'd':
@@ -1435,9 +1434,6 @@ main(int argc, char **argv)
* *
* Messages will be added to the command line warning and error lists * Messages will be added to the command line warning and error lists
* as appropriate. * as appropriate.
*
* XXX for each individual actions, check only required actions
* for non-required actions check warn if provided
*/ */
static void static void
@@ -1493,10 +1489,15 @@ check_cli_parameters(const int action)
} }
/* /*
* XXX if -D/--pgdata provided, and also * If -D/--pgdata was provided, but config_file_options.pgdata
* config_file_options.pgdata, warn -D/--pgdata will be * is set, warn that -D/--pgdata will be ignored.
* ignored
*/ */
if (runtime_options.data_dir[0] && config_file_options.data_directory[0])
{
item_list_append(&cli_warnings,
_("-D/--pgdata will be ignored if a repmgr configuration file is provided"));
}
if (*runtime_options.upstream_conninfo) if (*runtime_options.upstream_conninfo)
{ {