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

Use actual program name rather than "repmgr" when executing remote commands

Browse Source 
It's possible some distribution packages may assign a different name to the
"repmgr" binary (typically appending a version number), so we shouldn't hard-code
into the command string.

However it's reasonable to assume the "repmgr" binary will have the same name
across a replication cluster so we won't engage in any contortions to account
for possible variations.

Per GitHub #323
This commit is contained in:
Ian Barwick
2017-08-31 11:09:08 +09:00
parent 657125a3fb
commit 2264848601
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repmgr.c
View File

@@ -1301,7 +1301,7 @@ build_cluster_matrix(t_node_matrix_rec ***matrix_rec_dest, int *name_length)
*/ */
appendPQExpBuffer(&command, appendPQExpBuffer(&command,
"\"%s -d '%s' --cluster '%s' ", "\"%s -d '%s' --cluster '%s' ",
make_pg_path("repmgr"), make_pg_path((char *)progname()),
PQgetvalue(res, i, 0), PQgetvalue(res, i, 0),
PQgetvalue(res, i, 5)); PQgetvalue(res, i, 5));
@@ -1566,7 +1566,7 @@ build_cluster_crosscheck(t_node_status_cube ***dest_cube, int *name_length)
appendPQExpBuffer(&command, appendPQExpBuffer(&command,
"%s -d '%s' --cluster '%s' --node=%i ", "%s -d '%s' --cluster '%s' --node=%i ",
make_pg_path("repmgr"), make_pg_path((char *)progname()),
PQgetvalue(res, i, 0), PQgetvalue(res, i, 0),
options.cluster_name, options.cluster_name,
remote_node_id); remote_node_id);
@@ -5278,7 +5278,7 @@ do_standby_switchover(void)
initPQExpBuffer(&remote_command_str); initPQExpBuffer(&remote_command_str);
appendPQExpBuffer(&remote_command_str, appendPQExpBuffer(&remote_command_str,
"%s standby archive-config -f ", "%s standby archive-config -f ",
make_pg_path("repmgr")); make_pg_path((char *)progname()));
appendShellString(&remote_command_str, runtime_options.remote_config_file); appendShellString(&remote_command_str, runtime_options.remote_config_file);
appendPQExpBuffer(&remote_command_str, appendPQExpBuffer(&remote_command_str,
" --config-archive-dir="); " --config-archive-dir=");
@@ -5456,7 +5456,7 @@ do_standby_switchover(void)
/* --force */ /* --force */
appendPQExpBuffer(&remote_command_str, appendPQExpBuffer(&remote_command_str,
"%s standby restore-config -D ", "%s standby restore-config -D ",
make_pg_path("repmgr")); make_pg_path((char *)progname()));
appendShellString(&remote_command_str, remote_data_directory); appendShellString(&remote_command_str, remote_data_directory);
/* /*
@@ -5531,7 +5531,7 @@ do_standby_switchover(void)
appendPQExpBuffer(&remote_command_str, appendPQExpBuffer(&remote_command_str,
"%s -D ", "%s -D ",
make_pg_path("repmgr")); make_pg_path((char *)progname()));
appendShellString(&remote_command_str, remote_data_directory); appendShellString(&remote_command_str, remote_data_directory);
appendPQExpBuffer(&remote_command_str, " -f "); appendPQExpBuffer(&remote_command_str, " -f ");
appendShellString(&remote_command_str, runtime_options.remote_config_file); appendShellString(&remote_command_str, runtime_options.remote_config_file);
@@ -5562,7 +5562,7 @@ do_standby_switchover(void)
initPQExpBuffer(&remote_command_str); initPQExpBuffer(&remote_command_str);
appendPQExpBuffer(&remote_command_str, appendPQExpBuffer(&remote_command_str,
"%s -D ", "%s -D ",
make_pg_path("repmgr")); make_pg_path((char *)progname()));
appendShellString(&remote_command_str, remote_data_directory); appendShellString(&remote_command_str, remote_data_directory);
appendPQExpBuffer(&remote_command_str, " -f "); appendPQExpBuffer(&remote_command_str, " -f ");
appendShellString(&remote_command_str, runtime_options.remote_config_file); appendShellString(&remote_command_str, runtime_options.remote_config_file);