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
