Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DFDF89EDC for ; Mon, 2 Apr 2012 21:30:17 +0000 (UTC) Received: (qmail 90734 invoked by uid 500); 2 Apr 2012 21:30:17 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 90689 invoked by uid 500); 2 Apr 2012 21:30:17 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 90682 invoked by uid 99); 2 Apr 2012 21:30:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 21:30:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 21:30:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 845752388847; Mon, 2 Apr 2012 21:29:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308579 - /incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init Date: Mon, 02 Apr 2012 21:29:56 -0000 To: bigtop-commits@incubator.apache.org From: bmahe@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120402212956.845752388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bmahe Date: Mon Apr 2 21:29:56 2012 New Revision: 1308579 URL: http://svn.apache.org/viewvc?rev=1308579&view=rev Log: BIGTOP-494. Upgrade Apache Flume (incubating) to 1.1.0. Fix some issues Modified: incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init Modified: incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init?rev=1308579&r1=1308578&r2=1308579&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init Mon Apr 2 21:29:56 2012 @@ -68,7 +68,7 @@ FLUME_NODE_NAME=${FLUME_NODE_NAME:-$HOST start() { [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED log_success_msg "Starting $desc (flume-node): " - /bin/su -s /bin/bash -c "/bin/bash -c 'echo \$\$ > ${FLUME_PID_FILE} && exec ${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE --name $FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log' &" $USER &>>/dev/null + /bin/su -s /bin/bash -c "/bin/bash -c 'echo \$\$ > ${FLUME_PID_FILE} && exec ${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE --name $FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log' &" $USER RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL @@ -86,7 +86,7 @@ stop() { if [ -n $FLUME_PID ]; then kill -TERM ${FLUME_PID} &>/dev/null sleep 5 - kill -KILL -${FLUME_PID} &>/dev/null + kill -KILL ${FLUME_PID} &>/dev/null fi rm -f $LOCKFILE $FLUME_PID_FILE return 0 @@ -122,7 +122,7 @@ checkstatus(){ } condrestart(){ - [ -e /var/lock/subsys/flume-node ] && restart || : + [ -e ${LOCKFILE} ] && restart || : } case "$1" in