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

Improve database connection status checking

Browse Source
This commit is contained in:
Ian Barwick
2016-08-03 14:51:36 +09:00
committed by Ian Barwick
parent c26fd21351
commit c565be4ab6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repmgr.c
View File

@@ -1040,7 +1040,7 @@ do_cluster_cleanup(void)
log_info(_("connecting to master database\n")); log_info(_("connecting to master database\n"));
master_conn = get_master_connection(conn, options.cluster_name, master_conn = get_master_connection(conn, options.cluster_name,
NULL, NULL); NULL, NULL);
if (!master_conn) if (master_conn == NULL)
{ {
log_err(_("cluster cleanup: cannot connect to master\n")); log_err(_("cluster cleanup: cannot connect to master\n"));
PQfinish(conn); PQfinish(conn);
@@ -1312,7 +1312,7 @@ do_standby_register(void)
log_info(_("connecting to master database\n")); log_info(_("connecting to master database\n"));
master_conn = get_master_connection(conn, options.cluster_name, master_conn = get_master_connection(conn, options.cluster_name,
NULL, NULL); NULL, NULL);
if (!master_conn) if (master_conn == NULL)
{ {
log_err(_("a master must be defined before configuring a standby\n")); log_err(_("a master must be defined before configuring a standby\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
@@ -1443,7 +1443,7 @@ do_standby_unregister(void)
log_info(_("connecting to master database\n")); log_info(_("connecting to master database\n"));
master_conn = get_master_connection(conn, options.cluster_name, master_conn = get_master_connection(conn, options.cluster_name,
NULL, NULL); NULL, NULL);
if (!master_conn) if (master_conn == NULL)
{ {
log_err(_("a master must be defined before unregistering a standby\n")); log_err(_("a master must be defined before unregistering a standby\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
@@ -4383,6 +4383,12 @@ do_witness_unregister(void)
log_info(_("connecting to witness database\n")); log_info(_("connecting to witness database\n"));
conn = establish_db_connection(options.conninfo, true); conn = establish_db_connection(options.conninfo, true);
if (PQstatus(conn) != CONNECTION_OK)
{
log_err(_("unable to connect to witness server\n"));
exit(ERR_DB_CON);
}
/* Check if there is a schema for this cluster */ /* Check if there is a schema for this cluster */
if (check_cluster_schema(conn) == false) if (check_cluster_schema(conn) == false)
{ {
@@ -4396,7 +4402,7 @@ do_witness_unregister(void)
log_info(_("connecting to master server\n")); log_info(_("connecting to master server\n"));
master_conn = get_master_connection(conn, options.cluster_name, master_conn = get_master_connection(conn, options.cluster_name,
NULL, NULL); NULL, NULL);
if (!master_conn) if (master_conn == NULL)
{ {
log_err(_("Unable to connect to master server\n")); log_err(_("Unable to connect to master server\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);