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

Rename variable 'reconnect_intvl' to 'reconnect_interval'

Browse Source 
For consistency with the configuration file parameter name
This commit is contained in:
Ian Barwick
2015-11-09 11:04:42 +09:00
parent ce5a541960
commit 8e66e4811c
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
repmgrd.c
View File

@@ -561,10 +561,10 @@ witness_monitor(void)
{
log_warning(
_("unable to determine a valid master server; waiting %i seconds to retry...\n"),
local_options.reconnect_intvl
local_options.reconnect_interval
);
PQfinish(master_conn);
sleep(local_options.reconnect_intvl);
sleep(local_options.reconnect_interval);
}
else
{
@@ -742,7 +742,7 @@ standby_monitor(void)
check_connection(&upstream_conn, type, upstream_conninfo);
/*
* This takes up to local_options.reconnect_attempts *
* local_options.reconnect_intvl seconds
* local_options.reconnect_interval seconds
*/
if (PQstatus(upstream_conn) != CONNECTION_OK)
@@ -1720,7 +1720,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
}
PQclear(res);
sleep(local_options.reconnect_intvl);
sleep(local_options.reconnect_interval);
}
/* Close the connection to this server */
@@ -1793,7 +1793,7 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
/*
* Check if the node is still available if after
* local_options.reconnect_attempts * local_options.reconnect_intvl
* local_options.reconnect_attempts * local_options.reconnect_interval
* seconds of retries we cannot reconnect return false
*/
for (connection_retries = 0; connection_retries < local_options.reconnect_attempts; connection_retries++)
@@ -1811,9 +1811,9 @@ check_connection(PGconn **conn, const char *type, const char *conninfo)
{
log_warning(_("connection to %s has been lost, trying to recover... %i seconds before failover decision\n"),
type,
(local_options.reconnect_intvl * (local_options.reconnect_attempts - connection_retries)));
/* wait local_options.reconnect_intvl seconds between retries */
sleep(local_options.reconnect_intvl);
(local_options.reconnect_interval * (local_options.reconnect_attempts - connection_retries)));
/* wait local_options.reconnect_interval seconds between retries */
sleep(local_options.reconnect_interval);
}
else
{