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

Use stored node configuration file path when executing remote commands

Browse Source 
Makes life much easier.
This commit is contained in:
Ian Barwick
2017-08-10 09:12:07 +09:00
parent 1d99a07b43
commit 5fb86771b1
4 changed files with 31 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repmgr-client.c
View File

@@ -401,11 +401,6 @@ main(int argc, char **argv)
/* "standby switchover" options *
* ---------------------------- */
/* -C/--remote-config-file */
case 'C':
strncpy(runtime_options.remote_config_file, optarg, MAXPGPATH);
break;
case OPT_ALWAYS_PROMOTE:
runtime_options.always_promote = true;
break;
@@ -548,6 +543,13 @@ main(int argc, char **argv)
item_list_append(&cli_warnings,
_("--no-conninfo-password is deprecated; pasuse --use-recovery-conninfo-password to explicitly set a password"));
break;
/* -C/--remote-config-file */
case 'C':
item_list_append(&cli_warnings,
_("--remote-config-file is no longer required"));
break;
}
}
@@ -2684,16 +2686,13 @@ remote_command(const char *host, const char *user, const char *command, PQExpBuf
void
make_remote_repmgr_path(PQExpBufferData *output_buf)
make_remote_repmgr_path(PQExpBufferData *output_buf, t_node_info *remote_node_record)
{
appendPQExpBuffer(output_buf,
"%s ", make_pg_path("repmgr"));
"%s -f %s ",
make_pg_path("repmgr"),
remote_node_record->config_file);
if (runtime_options.remote_config_file[0] != '\0')
{
appendPQExpBuffer(output_buf,
"-f %s ", runtime_options.remote_config_file);
}
}