diff options
Diffstat (limited to 'dev-db/pgpool2')
| -rw-r--r-- | dev-db/pgpool2/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool2.initd | 19 |
2 files changed, 11 insertions, 14 deletions
diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog index 610004ef3343..65901527030e 100644 --- a/dev-db/pgpool2/ChangeLog +++ b/dev-db/pgpool2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/pgpool2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.4 2011/03/01 16:50:57 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.5 2011/03/02 08:52:52 scarabeus Exp $ + + 02 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/pgpool2.initd: + Update the initscript to use pgpool rather than start-stop-daemon, but it + still does not do what i want. TBD. *pgpool2-3.0.3 (01 Mar 2011) diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd index 554c9fed61b3..20f7ca2d6a3c 100644 --- a/dev-db/pgpool2/files/pgpool2.initd +++ b/dev-db/pgpool2/files/pgpool2.initd @@ -1,36 +1,29 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/files/pgpool2.initd,v 1.1 2011/01/26 16:49:10 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/files/pgpool2.initd,v 1.2 2011/03/02 08:52:52 scarabeus Exp $ depend() { need net } -ARGS="-f /etc/pgpool2/pgpool.conf -a /etc/pgpool2/pool_hba.conf -F /etc/pgpool2/pcp.conf -n" +ARGS="-f /etc/pgpool2/pgpool.conf -a /etc/pgpool2/pool_hba.conf -F /etc/pgpool2/pcp.conf -D" LOGFILE="/var/log/pgpool2.log" start() { ebegin "Starting pgpool2" - - if [ -n "${RC_UNAME}" ]; then - PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}" - else - PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1" - fi - - start-stop-daemon --start --quiet --background --exec /usr/bin/pgpool ${PARAMS} + /usr/bin/pgpool ${ARGS} >> "${LOGFILE}" 2>&1 eend $? } stop() { ebegin "Stopping pgpool2" - start-stop-daemon --stop --quiet --exec /usr/bin/pgpool + /usr/bin/pgpool -m fast stop >> "${LOGFILE}" 2>&1 eend $? } restart() { - stop + svc_stop sleep 3 - start + svc_start } |