From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B5036138247 for ; Sat, 9 Nov 2013 15:36:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE3BDE0999; Sat, 9 Nov 2013 15:36:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56A8DE0999 for ; Sat, 9 Nov 2013 15:36:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A72633EFA1 for ; Sat, 9 Nov 2013 15:36:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BD5B2E545C for ; Sat, 9 Nov 2013 15:36:03 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1384011307.a6a88dc3addc89f6b665828cb37a35270656023c.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.2/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.2/init/apache2.initd X-VCS-Directories: 2.2/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a6a88dc3addc89f6b665828cb37a35270656023c X-VCS-Branch: master Date: Sat, 9 Nov 2013 15:36:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 88e5cb8f-cf76-4d27-b944-42daa7f3f1b0 X-Archives-Hash: 8916a02829f60390557d5eff66e3671c commit: a6a88dc3addc89f6b665828cb37a35270656023c Author: Lars Wendler gentoo org> AuthorDate: Sat Nov 9 11:39:44 2013 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Nov 9 15:35:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=a6a88dc3 apache2.initd: Init script now returns as failed when apache fails to start. Signed-off-by: Lars Wendler gentoo.org> --- 2.2/init/apache2.initd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 249d3de..8cbb030 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -77,12 +77,13 @@ start() { # Use start stop daemon to apply system limits #347301 start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start - i=0 + local i=0 retval=1 while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do sleep 1 && i=$(expr $i + 1) + [ -e "${PIDFILE}" ] && retval=0 done - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } stop() { @@ -101,13 +102,14 @@ stop() { ebegin "Stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k stop - i=0 - while ( ! test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ + local i=0 retval=0 + while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ && [ $i -lt ${TIMEOUT} ]; do sleep 1 && i=$(expr $i + 1) done + [ -e "${PIDFILE}" ] && retval=1 - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } reload() { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 868E9138247 for ; Sat, 9 Nov 2013 15:39:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C785E08E0; Sat, 9 Nov 2013 15:39:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF9C5E08E0 for ; Sat, 9 Nov 2013 15:39:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E139E33DD33 for ; Sat, 9 Nov 2013 15:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 34E6EE545C for ; Sat, 9 Nov 2013 15:39:30 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1384011307.a6a88dc3addc89f6b665828cb37a35270656023c.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:trunk commit in: 2.2/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.2/init/apache2.initd X-VCS-Directories: 2.2/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a6a88dc3addc89f6b665828cb37a35270656023c X-VCS-Branch: trunk Date: Sat, 9 Nov 2013 15:39:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89f6f1f7-ca1f-44eb-a5de-0c96fd668298 X-Archives-Hash: 58a5c448825f69005afea201b1d0ce2a Message-ID: <20131109153930.no2OizS4TUpTgsyiaaO7IJ83t4ILh2VXJMLHoc9nptU@z> commit: a6a88dc3addc89f6b665828cb37a35270656023c Author: Lars Wendler gentoo org> AuthorDate: Sat Nov 9 11:39:44 2013 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Nov 9 15:35:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=a6a88dc3 apache2.initd: Init script now returns as failed when apache fails to start. Signed-off-by: Lars Wendler gentoo.org> --- 2.2/init/apache2.initd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 249d3de..8cbb030 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -77,12 +77,13 @@ start() { # Use start stop daemon to apply system limits #347301 start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start - i=0 + local i=0 retval=1 while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do sleep 1 && i=$(expr $i + 1) + [ -e "${PIDFILE}" ] && retval=0 done - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } stop() { @@ -101,13 +102,14 @@ stop() { ebegin "Stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k stop - i=0 - while ( ! test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ + local i=0 retval=0 + while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ && [ $i -lt ${TIMEOUT} ]; do sleep 1 && i=$(expr $i + 1) done + [ -e "${PIDFILE}" ] && retval=1 - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } reload() {