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

Consolidate connection closure calls

Browse Source
This commit is contained in:
Ian Barwick
2018-03-21 12:35:35 +09:00
committed by Ian Barwick
parent 71b13f5307
commit a403da67bc
4 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
repmgrd.c
View File

@@ -328,7 +328,7 @@ main(int argc, char **argv)
{
log_error(_("unable to determine status of \"repmgr\" extension"));
log_detail("%s", PQerrorMessage(local_conn));
PQfinish(local_conn);
close_connection(&local_conn);
exit(ERR_DB_QUERY);
}
@@ -345,7 +345,7 @@ main(int argc, char **argv)
}
log_hint(_("check that this node is part of a repmgr cluster"));
PQfinish(local_conn);
close_connection(&local_conn);
exit(ERR_BAD_CONFIG);
}
@@ -371,7 +371,7 @@ main(int argc, char **argv)
break;
}
PQfinish(local_conn);
close_connection(&local_conn);
terminate(ERR_BAD_CONFIG);
}
@@ -390,7 +390,7 @@ main(int argc, char **argv)
{
log_error(_("unable to write to shared memory"));
log_hint(_("ensure \"shared_preload_libraries\" includes \"repmgr\""));
PQfinish(local_conn);
close_connection(&local_conn);
terminate(ERR_BAD_CONFIG);
}
}
@@ -744,7 +744,7 @@ try_reconnect(t_node_info *node_info)
return conn;
}
PQfinish(conn);
close_connection(&conn);
log_notice(_("unable to reconnect to node"));
}
@@ -805,14 +805,10 @@ close_connections()
if (_close_connections != NULL)
_close_connections();
if (local_conn != NULL && PQstatus(local_conn) == CONNECTION_OK)
{
PQfinish(local_conn);
local_conn = NULL;
}
close_connection(&local_conn);
}
void
terminate(int retval)
{