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

repmgr: rename local variable config_file_found to remote_config_file_found

Browse Source 
We also have a global `config_file_found` - avoid confusion with that.
This commit is contained in:
Ian Barwick
2016-10-19 15:30:02 +09:00
parent e19c643389
commit a63baf7fcb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repmgr.c
View File

@@ -3666,7 +3666,7 @@ do_standby_clone(void)
file->filepath, dest_path, false, server_version_num); file->filepath, dest_path, false, server_version_num);
if (r != 0) if (r != 0)
{ {
log_err(_("standby clone: unable to copying config file '%s'\n"), log_err(_("standby clone: unable to copy config file '%s'\n"),
file->filename); file->filename);
} }
} }
@@ -4836,7 +4836,7 @@ do_standby_switchover(void)
else else
{ {
int i; int i;
bool config_file_found = false; bool remote_config_file_found = false;
const char *config_paths[] = { const char *config_paths[] = {
runtime_options.config_file, runtime_options.config_file,
@@ -4846,7 +4846,7 @@ do_standby_switchover(void)
log_verbose(LOG_INFO, _("no remote configuration file provided - checking default locations\n")); log_verbose(LOG_INFO, _("no remote configuration file provided - checking default locations\n"));
for (i = 0; config_paths[i] && config_file_found == false; ++i) for (i = 0; config_paths[i] && remote_config_file_found == false; ++i)
{ {
/* /*
* Don't attempt to check for an empty filename - this might be the case * Don't attempt to check for an empty filename - this might be the case
@@ -4878,13 +4878,13 @@ do_standby_switchover(void)
strncpy(runtime_options.remote_config_file, config_paths[i], MAXLEN); strncpy(runtime_options.remote_config_file, config_paths[i], MAXLEN);
log_verbose(LOG_INFO, _("configuration file \"%s\" found on remote server\n"), log_verbose(LOG_INFO, _("configuration file \"%s\" found on remote server\n"),
runtime_options.remote_config_file); runtime_options.remote_config_file);
config_file_found = true; remote_config_file_found = true;
} }
termPQExpBuffer(&command_output); termPQExpBuffer(&command_output);
} }
if (config_file_found == false) if (remote_config_file_found == false)
{ {
log_err(_("no remote configuration file supplied or found in a default location - terminating\n")); log_err(_("no remote configuration file supplied or found in a default location - terminating\n"));
log_hint(_("specify the remote configuration file with -C/--remote-config-file\n")); log_hint(_("specify the remote configuration file with -C/--remote-config-file\n"));