Commit12ff9fa

committed

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

match the Linux Standard Base Core Specification 3.1.Aaron W. Swenson

1 parentde1bf53 commit12ff9faCopy full SHA for 12ff9fa

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,8 @@ PostgreSQL documentation`
`205`	`205`	`<option>status</option> mode checks whether a server is running in`
`206`	`206`	`the specified data directory. If it is, the <acronym>PID</acronym>`
`207`	`207`	`and the command line options that were used to invoke it are`
`208`		`- displayed.`
	`208`	`+ displayed. If the server is not running, the process returns an`
	`209`	`+ exit status of 3.`
`209`	`210`	`</para>`
`210`	`211`
`211`	`212`	`<para>`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1155,9 +1155,11 @@ do_status(void)`
`1155`	`1155`	`pgpid_tpid;`
`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`

Comments

(0)