Commitac0d141

committed

Do not start if postmaster is running.

1 parent10283ee commitac0d141Copy full SHA for ac0d141

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.138 1999/12/22 00:07:15 inoue Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.139 2000/01/09 12:17:33 ishii Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* this is the "main" module of the postgres backend and`
`@@ -1356,6 +1356,19 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1356`	`1356`	`argv[0]);`
`1357`	`1357`	`proc_exit(1);`
`1358`	`1358`	`}`
	`1359`	`+`
	`1360`	`+/*`
	`1361`	`+ * Try to create pid file.`
	`1362`	`+ */`
	`1363`	`+SetPidFname(DataDir);`
	`1364`	`+if (SetPidFile(-getpid())) {`
	`1365`	`+proc_exit(0);`
	`1366`	`+}`
	`1367`	`+/*`
	`1368`	`+ * Register clean up proc.`
	`1369`	`+ */`
	`1370`	`+on_proc_exit(UnlinkPidFile,NULL);`
	`1371`	`+`
`1359`	`1372`	`BaseInit();`
`1360`	`1373`	`snprintf(XLogDir,MAXPGPATH,"%s%cpg_xlog",`
`1361`	`1374`	`DataDir,SEP_CHAR);`
`@@ -1499,7 +1512,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1499`	`1512`	`if (!IsUnderPostmaster)`
`1500`	`1513`	`{`
`1501`	`1514`	`puts("\nPOSTGRES backend interactive interface ");`
`1502`		`-puts("$Revision: 1.138 $ $Date:1999/12/22 00:07:15 $\n");`
	`1515`	`+puts("$Revision: 1.139 $ $Date:2000/01/09 12:17:33 $\n");`
`1503`	`1516`	`}`
`1504`	`1517`
`1505`	`1518`	`/*`

Comments

(0)