From 4f3bd6612cd5e1f67e9d7708cf51cf90d6a2ec86 Mon Sep 17 00:00:00 2001
From: Christian Kruse <cjk@defunct.ch>
Date: Thu, 16 Jan 2014 15:07:15 +0100
Subject: [PATCH] do not exit in getMasterConnection()

---
 dbutils.c | 3 +--
 repmgr.c  | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dbutils.c b/dbutils.c
index ae788bce..0ca9f7df 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -359,8 +359,7 @@ getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
 		log_err(_("Can't get nodes info: %s\n"),
 		        PQerrorMessage(standby_conn));
 		PQclear(res1);
-		PQfinish(standby_conn);
-		exit(ERR_DB_QUERY);
+		return NULL;
 	}
 
 	for (i = 0; i < PQntuples(res1); i++)
diff --git a/repmgr.c b/repmgr.c
index 3ce25c0e..eee477fa 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -1433,6 +1433,11 @@ do_standby_follow(void)
 
 	do
 	{
+		if (!is_pgup(conn, options.master_response_timeout))
+		{
+			conn = establishDBConnection(options.conninfo, true);
+		}
+
 		master_conn = getMasterConnection(conn, repmgr_schema,
 		                                  options.cluster_name, &master_id,(char *) &master_conninfo);
 	}