[gentoo-commits] gentoo-x86 commit in dev-db/postgresql-server/files: postgresql.conf-8.3 postgresql.init-8.3

[Caleb Tennis (caleb)]

caleb       08/09/28 22:53:02

  Modified:             postgresql.conf-8.3 postgresql.init-8.3
  Log:
  Change conf and init files for 8.3 for nicer startup/shutdown per 228639
  (Portage version: 2.2_rc11/cvs/Linux 2.6.21-gentoo-r1 i686)

Revision  Changes    Path
1.2                  dev-db/postgresql-server/files/postgresql.conf-8.3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.3?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.3?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.3?r1=1.1&r2=1.2

Index: postgresql.conf-8.3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql.conf-8.3	15 Apr 2008 09:29:55 -0000	1.1
+++ postgresql.conf-8.3	28 Sep 2008 22:53:02 -0000	1.2
@@ -40,6 +40,10 @@
 # Set to 0 to deactivate it
 WAIT_FOR_QUIT=60
 
+# Comment this out if you don't want to wait for the server to
+# startup before continuing.  For example, if this server is a 
+# PITR log shipping based replication standby
+WAIT_FOR_START="-w"
 
 # If you have to export environment variables for the database process,
 # this can be done here.



1.4                  dev-db/postgresql-server/files/postgresql.init-8.3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3?r1=1.3&r2=1.4

Index: postgresql.init-8.3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgresql.init-8.3	13 May 2008 07:00:36 -0000	1.3
+++ postgresql.init-8.3	28 Sep 2008 22:53:02 -0000	1.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.3 2008/05/13 07:00:36 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.4 2008/09/28 22:53:02 caleb Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,7 @@
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl start -w -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
@@ -58,16 +58,18 @@
 
 	local retval
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -TERM/${WAIT_FOR_DISCONNECT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -INT/${WAIT_FOR_CLEANUP}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -m fast"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -80,8 +82,9 @@
 	ewarn "Shutting down the server gracefully failed."
 	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -QUIT/${WAIT_FOR_QUIT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -m immediate"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -91,6 +94,7 @@
 
 reload() {
 	ebegin "Reloading PostgreSQL configuration"
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" --signal HUP --oknodo
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl reload"	
 	eend $?
 }