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

Fix a myriad of problems introduced by merging

Browse Source 
Signed-off-by: Dan Farina <drfarina@acm.org>
This commit is contained in:
Dan Farina
2011-02-06 18:32:49 -08:00
parent c356f9e97f
commit bfd3aed33b
7 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
repmgrd.c
View File

@@ -178,7 +178,9 @@ main(int argc, char **argv)
else
{
/* I need the id of the primary as well as a connection to it */
primaryConn = getMasterConnection(myLocalConn, config.node, config.cluster_name, &primaryId);
primaryConn = getMasterConnection(myLocalConn, config.node,
config.cluster_name, &primaryId,
NULL);
if (primaryConn == NULL)
exit(1);
@@ -249,7 +251,9 @@ MonitorExecute(void)
for (connection_retries = 0; connection_retries < 6;
connection_retries++)
{
primaryConn = getMasterConnection(myLocalConn, config.node, config.cluster_name, &primaryId);
primaryConn = getMasterConnection(myLocalConn, config.node,
config.cluster_name, &primaryId,
NULL);
if (PQstatus(primaryConn) == CONNECTION_OK)
{