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

repmgrd: consolidate SIGHUP handling

Browse Source 
Move identical code blocks into single function.
This commit is contained in:
Ian Barwick
2018-08-01 11:53:57 +09:00
parent e6ffbcc67a
commit d696c4019e
1 changed files with 29 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
repmgrd-physical.c
View File

@@ -81,6 +81,8 @@ static bool do_witness_failover(void);
static void update_monitoring_history(void); static void update_monitoring_history(void);
static void handle_sighup(PGconn *conn);
static const char * format_failover_state(FailoverState failover_state); static const char * format_failover_state(FailoverState failover_state);
@@ -545,26 +547,7 @@ loop:
if (got_SIGHUP) if (got_SIGHUP)
{ {
log_debug("SIGHUP received"); handle_sighup(local_conn);
if (reload_config(&config_file_options))
{
close_connection(&local_conn);
local_conn = establish_db_connection(config_file_options.conninfo, true);
if (*config_file_options.log_file)
{
FILE *fd;
fd = freopen(config_file_options.log_file, "a", stderr);
if (fd == NULL)
{
fprintf(stderr, "error reopening stderr to \"%s\": %s",
config_file_options.log_file, strerror(errno));
}
}
}
got_SIGHUP = false;
} }
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")", log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -1165,26 +1148,7 @@ loop:
if (got_SIGHUP) if (got_SIGHUP)
{ {
log_debug("SIGHUP received"); handle_sighup(local_conn);
if (reload_config(&config_file_options))
{
close_connection(&local_conn);
local_conn = establish_db_connection(config_file_options.conninfo, true);
if (*config_file_options.log_file)
{
FILE *fd;
fd = freopen(config_file_options.log_file, "a", stderr);
if (fd == NULL)
{
fprintf(stderr, "error reopening stderr to \"%s\": %s",
config_file_options.log_file, strerror(errno));
}
}
}
got_SIGHUP = false;
} }
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")", log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -1513,26 +1477,7 @@ loop:
if (got_SIGHUP) if (got_SIGHUP)
{ {
log_debug("SIGHUP received"); handle_sighup(local_conn);
if (reload_config(&config_file_options))
{
close_connection(&local_conn);
local_conn = establish_db_connection(config_file_options.conninfo, true);
if (*config_file_options.log_file)
{
FILE *fd;
fd = freopen(config_file_options.log_file, "a", stderr);
if (fd == NULL)
{
fprintf(stderr, "error reopening stderr to \"%s\": %s",
config_file_options.log_file, strerror(errno));
}
}
}
got_SIGHUP = false;
} }
log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")", log_verbose(LOG_DEBUG, "sleeping %i seconds (parameter \"monitor_interval_secs\")",
@@ -2982,3 +2927,27 @@ format_failover_state(FailoverState failover_state)
} }
static void
handle_sighup(PGconn *conn)
{
log_debug("SIGHUP received");
if (reload_config(&config_file_options))
{
close_connection(&conn);
conn = establish_db_connection(config_file_options.conninfo, true);
if (*config_file_options.log_file)
{
FILE *fd;
fd = freopen(config_file_options.log_file, "a", stderr);
if (fd == NULL)
{
fprintf(stderr, "error reopening stderr to \"%s\": %s",
config_file_options.log_file, strerror(errno));
}
}
}
got_SIGHUP = false;
}