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

Improve default host/dbname handling

Browse Source 
repmgr disallows socket connections anyway (the whole point of providing
the host is to connect to a remote machine) so don't show that as
a fallback default in the -?/--help output.
This commit is contained in:
Ian Barwick
2016-07-05 10:38:20 +09:00
parent dbd82ba687
commit 94d4e1128d
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
repmgr.c
View File

@@ -254,6 +254,15 @@ main(int argc, char **argv)
}
}
/*
* Though libpq will default to the username as dbname, PQconndefaults()
* doesn't return this
*/
if (runtime_options.dbname[0] == '\0')
{
strncpy(runtime_options.dbname, runtime_options.username, MAXLEN);
}
/* Prevent getopt_long() from printing an error message */
opterr = 0;
@@ -470,8 +479,7 @@ main(int argc, char **argv)
else
{
/*
* Set runtime_options.(host|port|username) values, if provided, to prevent these
* being overwritten by the defaults
* Set runtime_options.(host|port|username) values
*/
PQconninfoOption *opt;
for (opt = opts; opt->keyword != NULL; opt++)
@@ -481,6 +489,11 @@ main(int argc, char **argv)
{
strncpy(runtime_options.host, opt->val, MAXLEN);
}
if (strcmp(opt->keyword, "hostaddr") == 0 &&
(opt->val != NULL && opt->val[0] != '\0'))
{
strncpy(runtime_options.host, opt->val, MAXLEN);
}
else if (strcmp(opt->keyword, "port") == 0 &&
(opt->val != NULL && opt->val[0] != '\0'))
{
@@ -501,8 +514,6 @@ main(int argc, char **argv)
exit_with_errors();
}
if (check_upstream_config == true)
{
do_check_upstream_config();
@@ -4232,7 +4243,10 @@ do_help(void)
printf(_("\n"));
printf(_("Connection options:\n"));
printf(_(" -d, --dbname=DBNAME database to connect to (default: \"%s\")\n"), runtime_options.dbname);
printf(_(" -h, --host=HOSTNAME database server host or socket directory (default: \"%s\")\n"), runtime_options.host[0] == '\0' ? _("local socket") : runtime_options.host);
printf(_(" -h, --host=HOSTNAME database server host"));
if (runtime_options.host[0] != '\0')
printf(_(" (default: \"%s\")"), runtime_options.host);
printf(_("\n"));
printf(_(" -p, --port=PORT database server port (default: \"%s\")\n"), runtime_options.masterport);
printf(_(" -U, --username=USERNAME database user name to connect as (default: \"%s\")\n"), runtime_options.username);
printf(_("\n"));
@@ -4720,23 +4734,7 @@ check_parameters_for_action(const int action)
if (strcmp(runtime_options.host, "") == 0)
{
bool conninfo_host_provided = false;
PQconninfoOption *opt;
for (opt = opts; opt->keyword != NULL; opt++)
{
if (strcmp(opt->keyword, "host") == 0 ||
strcmp(opt->keyword, "hostaddr") == 0)
{
if (opt->val != NULL && opt->val[0] != '\0')
{
conninfo_host_provided = true;
break;
}
}
}
if (conninfo_host_provided == false)
error_list_append(&cli_errors, _("master hostname (-h/--host) required when executing STANDBY CLONE"));
error_list_append(&cli_errors, _("master hostname (-h/--host) required when executing STANDBY CLONE"));
}
if (runtime_options.fast_checkpoint && runtime_options.rsync_only)