diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-02 08:52:52 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-02 08:52:52 +0000 |
| commit | aca0b47f2352aee32ff521a39cc61629177c0864 (patch) | |
| tree | 7bde122300b04df2ff04b9670de027b1da3f12f6 /dev-db/pgpool2 | |
| parent | x86 stable per bug 355583 (diff) | |
| download | historical-aca0b47f2352aee32ff521a39cc61629177c0864.tar.gz historical-aca0b47f2352aee32ff521a39cc61629177c0864.tar.bz2 historical-aca0b47f2352aee32ff521a39cc61629177c0864.zip | |
Update the initscript to use pgpool rather than start-stop-daemon, but it still does not do what i want. TBD.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'dev-db/pgpool2')
| -rw-r--r-- | dev-db/pgpool2/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/pgpool2/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool2.initd | 19 |
3 files changed, 13 insertions, 16 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/Manifest b/dev-db/pgpool2/Manifest index fec98df327e8..541f26ec1fc8 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,6 +1,6 @@ -AUX pgpool2.initd 823 RMD160 0aa71634f1fb2971c89273e859fd2a197c7e5b1e SHA1 f61ee62bcfdfd30ac0e7ecc9064d64582e40a0ee SHA256 8ff44a4bc1a557f25bd6d2f05ae6f651e04e439f1f45761d4655ba695ed1d3d2 +AUX pgpool2.initd 625 RMD160 c19f8bb11c2a6f353f1aae65d1a6452e6a301d52 SHA1 d45254f3972df9fead5d85f76be399b771a3237a SHA256 65d00f07f7c14f78c8a4f41c49ef5d9542796ea2278e74c022b93dd7d6ff60fc DIST pgpool-II-3.0.3.tar.gz 1202898 RMD160 06643c78de389777d378f13b6c9667eeee2d6cb2 SHA1 3b28e04a7dd664bf0b8fd2be58e99465bdc39c13 SHA256 46384b14b6690fcaddd472de8bbeb03f901eeb9f3303386a932016b5c28bc9fe EBUILD pgpool2-3.0.3.ebuild 1474 RMD160 7d1f4522c802122a4fcda660b6a163453a05ae5b SHA1 5aee84c7b043db07542428f94bb64b3ca5e76620 SHA256 4fa43076b170ee863a5e3f4032f286460465ace51ab8b5ca4f62036232425cb9 EBUILD pgpool2-9999.ebuild 1449 RMD160 39b970c10f24a14ad400191b358fd135c55f4bfc SHA1 dc06cb096d89f96182324cf314a56bce9c3cd694 SHA256 8da25ccccdb62bb2c602c8b18f2c814270c93378993d28a163e2c8d226f20700 -MISC ChangeLog 1022 RMD160 de8bd3ad9ad49494c0350cefc361fdfc4ce01ffd SHA1 19113af1842f63ab1eabaecfb62b69607b4a2680 SHA256 7606de27b9a0e8d9723c485ffcfc405fb67b76fdfe47795af4e5c6ac53f5650e +MISC ChangeLog 1213 RMD160 c1f4c4ece62754a626b07d73af60e8494fa95f8b SHA1 eadb7974bd8663698f9e53aaff4dc42bb622b9bf SHA256 bc8721863b46a41a8b5fe616cd88ca3243a04170e33537b53febb92534f56a99 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b 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 } |