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

Have make_pg_path() output to a PQexpBuffer

Browse Source 
Calling functions are all using one anyway, so there's no point keeping
static buffers around.
This commit is contained in:
Ian Barwick
2020-09-02 15:30:02 +09:00
parent 1f7ac843fd
commit c8e52e486f
4 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
repmgr-action-standby.c
View File

@@ -6564,9 +6564,11 @@ initialise_direct_clone(t_node_info *local_node_record, t_node_info *upstream_no
static int
run_basebackup(t_node_info *node_record)
{
char script[MAXLEN] = "";
int r = SUCCESS;
PQExpBufferData params;
PQExpBufferData script;
int r = SUCCESS;
TablespaceListCell *cell = NULL;
t_basebackup_options backup_options = T_BASEBACKUP_OPTIONS_INITIALIZER;
@@ -6717,21 +6719,25 @@ run_basebackup(t_node_info *node_record)
}
}
maxlen_snprintf(script,
"%s -l \"repmgr base backup\" %s %s",
make_pg_path("pg_basebackup"),
params.data,
config_file_options.pg_basebackup_options);
initPQExpBuffer(&script);
make_pg_path(&script, "pg_basebackup");
appendPQExpBuffer(&script,
" -l \"repmgr base backup\" %s %s",
params.data,
config_file_options.pg_basebackup_options);
termPQExpBuffer(&params);
log_info(_("executing:\n %s"), script);
log_info(_("executing:\n %s"), script.data);
/*
* As of 9.4, pg_basebackup only ever returns 0 or 1
*/
r = system(script);
r = system(script.data);
termPQExpBuffer(&script);
if (r != 0)
return ERR_BAD_BASEBACKUP;