Fix pg_ctl -w to properly wait on server startup.

bmomjian · bmomjian · commit 34f34a041c72 · 2004-08-21T03:12:55.000Z
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.24 2004/07/29 16:11:11 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.25 2004/08/21 03:12:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -404,12 +404,23 @@ test_postmaster_connection(void)
 
 	for (i = 0; i < wait_seconds; i++)
 	{
-		if ((conn = PQsetdbLogin(NULL, portstr, NULL, NULL, "template1", NULL, NULL)) != NULL)
+		if ((conn = PQsetdbLogin(NULL, portstr, NULL, NULL,
+					"template1", NULL, NULL)) != NULL &&
+			PQstatus(conn) == CONNECTION_OK)
 		{
 			PQfinish(conn);
 			success = true;
 			break;
 		}
+		else
+		{
+			if (!silence_echo)
+			{
+				printf(".");
+				fflush(stdout);
+			}
+			pg_usleep(1000000); /* 1 sec */
+		}
 	}
 
 	return success;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.24 2004/07/29 16:11:11 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.25 2004/08/21 03:12:55 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -404,12 +404,23 @@ test_postmaster_connection(void)`
`404`	`404`
`405`	`405`	`for (i = 0; i < wait_seconds; i++)`
`406`	`406`	`{`
`407`		`- if ((conn = PQsetdbLogin(NULL, portstr, NULL, NULL, "template1", NULL, NULL)) != NULL)`
	`407`	`+ if ((conn = PQsetdbLogin(NULL, portstr, NULL, NULL,`
	`408`	`+ "template1", NULL, NULL)) != NULL &&`
	`409`	`+ PQstatus(conn) == CONNECTION_OK)`
`408`	`410`	`{`
`409`	`411`	`PQfinish(conn);`
`410`	`412`	`success = true;`
`411`	`413`	`break;`
`412`	`414`	`}`
	`415`	`+ else`
	`416`	`+ {`
	`417`	`+ if (!silence_echo)`
	`418`	`+ {`
	`419`	`+ printf(".");`
	`420`	`+ fflush(stdout);`
	`421`	`+ }`
	`422`	`+ pg_usleep(1000000); /* 1 sec */`
	`423`	`+ }`
`413`	`424`	`}`
`414`	`425`
`415`	`426`	`return success;`