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

repmgr standby clone historically accepts a hostname as third parameter

Browse Source
This commit is contained in:
Ian Barwick
2016-07-15 11:17:05 +09:00
parent 340899f082
commit 94befc3230
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr.c
View File

@@ -139,6 +139,7 @@ t_runtime_options runtime_options = T_RUNTIME_OPTIONS_INITIALIZER;
t_configuration_options options = T_CONFIGURATION_OPTIONS_INITIALIZER; t_configuration_options options = T_CONFIGURATION_OPTIONS_INITIALIZER;
bool wal_keep_segments_used = false; bool wal_keep_segments_used = false;
bool conninfo_provided = false;
bool connection_param_provided = false; bool connection_param_provided = false;
bool host_param_provided = false; bool host_param_provided = false;
bool pg_rewind_supplied = false; bool pg_rewind_supplied = false;
@@ -500,6 +501,8 @@ main(int argc, char **argv)
{ {
char *errmsg = NULL; char *errmsg = NULL;
conninfo_provided = true;
opts = PQconninfoParse(runtime_options.dbname, &errmsg); opts = PQconninfoParse(runtime_options.dbname, &errmsg);
if (opts == NULL) if (opts == NULL)
@@ -655,18 +658,24 @@ main(int argc, char **argv)
} }
} }
/* For some actions we still can receive a last argument */ /* STANDBY CLONE historically accepts the upstream hostname as an additional argument */
if (action == STANDBY_CLONE) if (action == STANDBY_CLONE)
{ {
if (optind < argc) if (optind < argc)
{ {
if (runtime_options.host[0]) if (runtime_options.host[0])
{ {
error_list_append(&cli_errors, _("Conflicting parameters: you can't use -h while providing a node separately.")); PQExpBufferData additional_host_arg;
initPQExpBuffer(&additional_host_arg);
appendPQExpBuffer(&additional_host_arg,
_("Conflicting parameters: you can't use %s while providing a node separately."),
conninfo_provided == true ? "host=" : "-h/--host");
error_list_append(&cli_errors, additional_host_arg.data);
} }
else else
{ {
strncpy(runtime_options.host, argv[optind++], MAXLEN); strncpy(runtime_options.host, argv[optind++], MAXLEN);
param_set("host", runtime_options.host);
} }
} }
} }