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

repmgrd: fix configuration file reloading

Browse Source 
Don't allow "promote_command" or "follow_command" to be empty.

GitHub #486.
This commit is contained in:
Ian Barwick
2018-08-02 15:08:26 +09:00
parent 3a789d53e0
commit 2fb0f056fe
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
repmgrd-physical.c
View File

@@ -81,7 +81,7 @@ static bool do_witness_failover(void);
static void update_monitoring_history(void);
static void handle_sighup(PGconn *conn);
static void handle_sighup(PGconn **conn, t_server_type server_type);
static const char * format_failover_state(FailoverState failover_state);
@@ -547,7 +547,7 @@ loop:
if (got_SIGHUP)
{
handle_sighup(local_conn);
handle_sighup(&local_conn, PRIMARY);
}
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -1148,7 +1148,7 @@ loop:
if (got_SIGHUP)
{
handle_sighup(local_conn);
handle_sighup(&local_conn, STANDBY);
}
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -1477,7 +1477,7 @@ loop:
if (got_SIGHUP)
{
handle_sighup(local_conn);
handle_sighup(&local_conn, WITNESS);
}
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -2928,14 +2928,14 @@ format_failover_state(FailoverState failover_state)
static void
handle_sighup(PGconn *conn)
handle_sighup(PGconn **conn, t_server_type server_type)
{
log_debug("SIGHUP received");
if (reload_config(&config_file_options))
if (reload_config(&config_file_options, server_type))
{
close_connection(&conn);
conn = establish_db_connection(config_file_options.conninfo, true);
PQfinish(*conn);
*conn = establish_db_connection(config_file_options.conninfo, true);
}
if (*config_file_options.log_file)