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

standby follow: fix standby.signal generation

Browse Source 
Oversight from previous a93c6dfc.
This commit is contained in:
Ian Barwick
2020-12-02 09:11:20 +09:00
parent 93187e9743
commit d5b94431f2
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repmgr-action-standby.c
View File

@@ -212,7 +212,6 @@ do_standby_clone(void)
* conninfo params for the actual upstream node (which might be different * conninfo params for the actual upstream node (which might be different
* to the node we're cloning from) to write to recovery.conf * to the node we're cloning from) to write to recovery.conf
*/ */
mode = get_standby_clone_mode(); mode = get_standby_clone_mode();
if (mode == barman) if (mode == barman)
@@ -7975,9 +7974,9 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_co
free(escaped); free(escaped);
} }
/*
* Caller requests the generated file to be written into a buffer
*/
if (as_file == false) if (as_file == false)
{ {
/* create file in buffer */ /* create file in buffer */
@@ -7997,20 +7996,17 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_co
return true; return true;
} }
/* /*
* PostgreSQL 12 and later: modify postgresql.auto.conf * PostgreSQL 12 and later: modify postgresql.auto.conf
*
*/ */
if (server_version_num >= 120000) if (server_version_num >= 120000)
{ {
if (modify_auto_conf(dest, &recovery_config) == false) if (modify_auto_conf(dest, &recovery_config) == false)
{ {
return false; return false;
} }
if (write_standby_signal(local_data_directory) == false) if (write_standby_signal(dest) == false)
{ {
return false; return false;
} }