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

Fix error code handling

Browse Source
This commit is contained in:
Ian Barwick
2015-01-05 10:49:21 +09:00
parent 4f37515113
commit 8e09e7b57c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr.c
View File

@@ -1061,6 +1061,7 @@ do_standby_clone(void)
if (r != 0) if (r != 0)
{ {
log_warning(_("standby clone: base backup failed\n")); log_warning(_("standby clone: base backup failed\n"));
retval = ERR_BAD_BASEBACKUP;
goto stop_backup; goto stop_backup;
} }
@@ -1081,7 +1082,8 @@ do_standby_clone(void)
log_err(_("%s: Aborting, remote host %s is not reachable.\n"), log_err(_("%s: Aborting, remote host %s is not reachable.\n"),
progname, runtime_options.host); progname, runtime_options.host);
PQfinish(conn); PQfinish(conn);
exit(ERR_BAD_SSH); retval = ERR_BAD_SSH;
goto stop_backup;
} }
if(strlen(master_config_file)) if(strlen(master_config_file))
@@ -1093,6 +1095,7 @@ do_standby_clone(void)
{ {
log_warning(_("standby clone: failed copying master config file '%s'\n"), log_warning(_("standby clone: failed copying master config file '%s'\n"),
master_config_file); master_config_file);
retval = ERR_BAD_SSH;
goto stop_backup; goto stop_backup;
} }
} }
@@ -1106,6 +1109,7 @@ do_standby_clone(void)
{ {
log_warning(_("standby clone: failed copying master hba file '%s'\n"), log_warning(_("standby clone: failed copying master hba file '%s'\n"),
master_hba_file); master_hba_file);
retval = ERR_BAD_SSH;
goto stop_backup; goto stop_backup;
} }
} }
@@ -1119,6 +1123,7 @@ do_standby_clone(void)
{ {
log_warning(_("standby clone: failed copying master ident file '%s'\n"), log_warning(_("standby clone: failed copying master ident file '%s'\n"),
master_ident_file); master_ident_file);
retval = ERR_BAD_SSH;
goto stop_backup; goto stop_backup;
} }
} }
@@ -1137,7 +1142,7 @@ stop_backup:
log_err(_("Unable to take a base backup of the primary server\n")); log_err(_("Unable to take a base backup of the primary server\n"));
log_warning(_("The destination directory (%s) will need to be cleaned up manually\n"), log_warning(_("The destination directory (%s) will need to be cleaned up manually\n"),
local_data_directory); local_data_directory);
exit(ERR_BAD_BASEBACKUP); exit(retval);
} }
log_notice(_("%s base backup of standby complete\n"), progname); log_notice(_("%s base backup of standby complete\n"), progname);
@@ -1157,7 +1162,8 @@ stop_backup:
log_notice("for example : /etc/init.d/postgresql start\n"); log_notice("for example : /etc/init.d/postgresql start\n");
} }
} }
exit(r);
exit(retval);
} }
@@ -1883,6 +1889,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
return r; return r;
} }
static int static int
run_basebackup() run_basebackup()
{ {