Have pg_ctl return an exit status of 3 if the server is not running, to

bmomjian · bmomjian · commit 12ff9fa77156 · 2011-10-13T13:02:36.000-04:00
match the Linux Standard Base Core Specification 3.1.

Aaron W. Swenson
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -205,7 +205,8 @@ PostgreSQL documentation
    <option>status</option> mode checks whether a server is running in
    the specified data directory. If it is, the <acronym>PID</acronym>
    and the command line options that were used to invoke it are
-   displayed.
+   displayed.  If the server is not running, the process returns an
+   exit status of 3.
   </para>
 
   <para>
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -1155,9 +1155,11 @@ do_status(void)
 	pgpid_t		pid;
 
 	pid = get_pgpid();
-	if (pid != 0)				/* 0 means no pid file */
+	/* Is there a pid file? */
+	if (pid != 0)
 	{
-		if (pid < 0)			/* standalone backend */
+		/* standalone backend? */
+		if (pid < 0)
 		{
 			pid = -pid;
 			if (postmaster_is_alive((pid_t) pid))
@@ -1168,7 +1170,7 @@ do_status(void)
 			}
 		}
 		else
-			/* postmaster */
+		/* must be a postmaster */
 		{
 			if (postmaster_is_alive((pid_t) pid))
 			{
@@ -1186,7 +1188,11 @@ do_status(void)
 		}
 	}
 	printf(_("%s: no server running\n"), progname);
-	exit(1);
+	/*
+	 * The Linux Standard Base Core Specification 3.1 says this should return '3'
+	 * http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
+	 */
+	exit(3);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1155,9 +1155,11 @@ do_status(void)`
`1155`	`1155`	`pgpid_t pid;`
`1156`	`1156`
`1157`	`1157`	`pid = get_pgpid();`
`1158`		`- if (pid != 0) /* 0 means no pid file */`
	`1158`	`+ /* Is there a pid file? */`
	`1159`	`+ if (pid != 0)`
`1159`	`1160`	`{`
`1160`		`- if (pid < 0) /* standalone backend */`
	`1161`	`+ /* standalone backend? */`
	`1162`	`+ if (pid < 0)`
`1161`	`1163`	`{`
`1162`	`1164`	`pid = -pid;`
`1163`	`1165`	`if (postmaster_is_alive((pid_t) pid))`
`@@ -1168,7 +1170,7 @@ do_status(void)`
`1168`	`1170`	`}`
`1169`	`1171`	`}`
`1170`	`1172`	`else`
`1171`		`- /* postmaster */`
	`1173`	`+ /* must be a postmaster */`
`1172`	`1174`	`{`
`1173`	`1175`	`if (postmaster_is_alive((pid_t) pid))`
`1174`	`1176`	`{`
`@@ -1186,7 +1188,11 @@ do_status(void)`
`1186`	`1188`	`}`
`1187`	`1189`	`}`
`1188`	`1190`	`printf(_("%s: no server running\n"), progname);`
`1189`		`- exit(1);`
	`1191`	`+ /*`
	`1192`	`+ * The Linux Standard Base Core Specification 3.1 says this should return '3'`
	`1193`	`+ * http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html`
	`1194`	`+ */`
	`1195`	`+ exit(3);`
`1190`	`1196`	`}`
`1191`	`1197`
`1192`	`1198`