commit: a0f7ccd2070f3830f49ab847dd167ada0a261e75 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> AuthorDate: Thu Mar 13 09:44:08 2014 +0000 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> CommitDate: Thu Mar 13 09:44:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=a0f7ccd2
enhanced couchbase-server init script --- dev-db/couchbase-server-community/Manifest | 2 +- .../couchbase-server-community/files/couchbase-server | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dev-db/couchbase-server-community/Manifest b/dev-db/couchbase-server-community/Manifest index 55957ac..1ed6375 100644 --- a/dev-db/couchbase-server-community/Manifest +++ b/dev-db/couchbase-server-community/Manifest @@ -1,4 +1,4 @@ -AUX couchbase-server 1174 SHA256 9c0194265914228c0a1ee1ede582008895b717b7656b304f36dcb5c8c99fa512 SHA512 d8c53e0567f3309d8e601a6500083c5b1846632deadd8cd0000d944db78a7f59c1a0a3658a4b7b16ff181579d5e019c728ab04e9f0c4649d65118e2d2faa25e3 WHIRLPOOL 605b3f02f2b4eafb7c8980fb0d9ed2f2a49d1a8b08ad80eea21cf0c394bd3b9dbe75daff3e4a1c8b46bf15894567f346a2fe49e9af56fcff635703933bde2968 +AUX couchbase-server 1408 SHA256 36574d62a3cbd7e20d0ed90de5391eeee78057735290c4a6801d8ad0a311a674 SHA512 66a381beaf6c3f7749bd13acd054c392746e463741b641d0da83360e5e511b8e3a98515e9280a64739517a61c55eaed06def81a49d4a15801d4fc14257ee4b12 WHIRLPOOL 53a90efcc346b2869bac8023a2770805e5cf169da2415eff2116c1a8986c6794ddebc6160d275994d573f682fef652fa609a863dc4ebfb9a3c352ff6f634a0f5 DIST couchbase-server-community_2.2.0_x86.deb 135143596 SHA256 8d00532af7f60963e8a3b8002731ddf2245eb1942381337377502bebe4e8b0b6 SHA512 3b15fc496c225bd67f1592fb66e3febad6c04e929499db18a4ddc3e87eee6986836aeee6964e114f710f346102e8ed8aa93dad7b5136684dd1ea6e3a8e64ba5e WHIRLPOOL 5b61bf14a01e9eb72e93f85c7e2882627c39c560c006823dbc0c4b22657d4456198633b16cd6e0da4aab02a49ffd3a7343666d4b796069d6052f93001978fbbe DIST couchbase-server-community_2.2.0_x86_64.deb 137295996 SHA256 051b0905e13241de19fbd9efb1e22a421f33429a1db3e4b5e3ae8756b9e4d6a2 SHA512 1001177631312f7dd75aa270e8eb32cfd076e9c6de42968619513f3adf640d1973120e3dded1e47b98cb47e25886111a9d1de29c6f405ffbbdae4e31d7225c67 WHIRLPOOL caab764b78b6b8386267d91e1bd8cbc82741384e221f25e169cd11c498f8ed4c596b03d9873915d1d174d82e4d80110952d54e5bf3183b31aad58e699784d3c9 EBUILD couchbase-server-community-2.2.0.ebuild 1405 SHA256 b4053455e404d03f14f8856dbeded80e6bef3280f7277fd7609d56a413b48908 SHA512 d8248156ba43dc12fdda9159400488dca60acb0ff4945f9c376d9d4810b28976c66d1532b7a2b73b3b4b1296b16f8aa7baf8b4ee85a64b614b5cef945226f540 WHIRLPOOL 6b973365e52c0b02b7c0afcdde7b4de75e070704f448f7eb2c90929814df33cfad38bc5b9ef9c1dd8f8b14ff1a0dcaec9245af09ab4a4425b2f67eb14aa518ce diff --git a/dev-db/couchbase-server-community/files/couchbase-server b/dev-db/couchbase-server-community/files/couchbase-server index 4912a83..273613a 100755 --- a/dev-db/couchbase-server-community/files/couchbase-server +++ b/dev-db/couchbase-server-community/files/couchbase-server @@ -25,9 +25,24 @@ checkconfig() { start() { checkconfig || return $? - ebegin "Starting ${SVCNAME} (waiting 10 seconds for startup)" - start-stop-daemon --start --chdir ${BASEDIR} --user couchbase --pidfile ${PIDFILE} --wait 10000 \ + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --chdir ${BASEDIR} --user couchbase --pidfile ${PIDFILE} \ --exec /bin/sh -- -c "${DAEMON} -- -noinput -detached > /opt/couchbase/var/lib/couchbase/logs/start.log 2>&1" + + einfon "Waiting for startup ." + nc=0 + while true; do + [ -f ${PIDFILE} ] && ps --pid $(cat ${PIDFILE}) &>/dev/null && break + nc=$(expr $nc + 1) + if [ $nc -gt 60 ]; then + echo + eend 1 "Timeout waiting for ${SVCNAME} startup !" + exit 1 + fi + sleep 1 + echo -n "." + done + eend $? "Failed to start ${SVCNAME}" }