Adjust postmaster to recognize that a lockfile containing its parent's PID

[postgresql] / contrib / start-scripts / PostgreSQL.darwin

diff --git a/contrib/start-scripts/PostgreSQL.darwin b/contrib/start-scripts/PostgreSQL.darwin
index 987c162f295661efff7eb843ed850e795030be4c..3e4b86a7f3b3f65e8eb353f9ae29ac70a9f749b4 100755 (executable)
--- a/contrib/start-scripts/PostgreSQL.darwin
+++ b/contrib/start-scripts/PostgreSQL.darwin
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ##
-# PotgreSQL RDBMS Server
+# PostgreSQL RDBMS Server
 ##
 
 # PostgreSQL boot time startup script for Darwin/Mac OS X. To install, change
@@ -12,15 +12,15 @@
 # directory it is in. So you'll end up with these two files:
 #
 #    /Library/StartupItems/PostgreSQL/PostgreSQL
-#    /Library/StartupItems/PostgreSQLStartupParameters.plist
+#    /Library/StartupItems/PostgreSQL/StartupParameters.plist
 #
 # Next, add this line to the /etc/hostconfig file:
 #
 # POSTGRESQLSERVER=-YES-
 #
-# The startup bundle will now be read to go. To prevent this script from
+# The startup bundle will now be ready to go. To prevent this script from
 # starting PostgreSQL at system startup, simply change that line in
-# /etc/hostconfig to:
+# /etc/hostconfig back to:
 #
 # POSTGRESQLSERVER=-NO-
 #
@@ -30,21 +30,36 @@
 #
 # Created by David Wheeler, 2002.
 
+# modified by Ray Aspeitia 12-03-2003 : 
+# added log rotation script to db startup
+# modified StartupParameters.plist "Provides" parameter to make it easier to 
+# start and stop with the SystemStarter utitlity
+
+# use the below command in order to correctly start/stop/restart PG with log rotation script:
+# SystemStarter [start|stop|restart] PostgreSQL
+
 ################################################################################
 ## EDIT FROM HERE
 ################################################################################
 
 # Installation prefix
-prefix=/usr/local/pgsql
+prefix="/usr/local/pgsql"
 
 # Data directory
 PGDATA="/usr/local/pgsql/data"
 
-# Who to run pg_ctl as, should be "postgres".
-PGUSER=postgres
+# Who to run the postmaster as, usually "postgres".  (NOT "root")
+PGUSER="postgres"
+
+# the logfile path and name (NEEDS to be writeable by PGUSER)
+PGLOG="${PGDATA}/logs/logfile"
+
+# do you want to rotate the log files, 1=true 0=false
+ROTATELOGS=1
+
+# logfile rotate in seconds
+ROTATESEC="604800"
 
-# Where to keep a log file
-PGLOG="$PGDATA/serverlog"
 
 ################################################################################
 ## STOP EDITING HERE
@@ -53,29 +68,48 @@ PGLOG="$PGDATA/serverlog"
 # The path that is to be used for the script
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-# What to use to start up the postmaster
-DAEMON="$prefix/bin/pg_ctl"
+# What to use to start up the postmaster (we do NOT use pg_ctl for this,
+# as it adds no value and can cause the postmaster to misrecognize a stale
+# lock file)
+DAEMON="$prefix/bin/postmaster"
+
+# What to use to shut down the postmaster
+PGCTL="$prefix/bin/pg_ctl"
+
+# The apache log rotation utility
+LOGUTIL="/usr/sbin/rotatelogs"
 
 . /etc/rc.common
 
 StartService () {
     if [ "${POSTGRESQLSERVER:=-NO-}" = "-YES-" ]; then
-       ConsoleMessage "Starting PostgreSQL database server"
-       sudo -u $PGUSER $DAEMON start -D "$PGDATA" -s -l $PGLOG
+        ConsoleMessage "Starting PostgreSQL database server"
+        if [ "${ROTATELOGS}" = "1" ]; then
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &"
+        else
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+        fi
     fi
 }
 
 StopService () {
     ConsoleMessage "Stopping PostgreSQL database server"
-    sudo -u $PGUSER $DAEMON stop -D "$PGDATA" -s -m fast
+    sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
 }
 
 RestartService () {
     if [ "${POSTGRESQLSERVER:=-NO-}" = "-YES-" ]; then
         ConsoleMessage "Restarting PostgreSQL database server"
-       sudo -u $PGUSER $DAEMON restart -D "$PGDATA" -s -m fast
+       # should match StopService:
+       sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
+       # should match StartService:
+        if [ "${ROTATELOGS}" = "1" ]; then
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &"
+        else
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+        fi
     else
-       StopService
+        StopService
     fi
 }