You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/01/24 00:59:27 UTC
git commit: BIGTOP-826: Wrong return code returned when stopping Hue
on RHEL/SUSE
Updated Branches:
refs/heads/master 896a7fa47 -> 4d088f9bb
BIGTOP-826: Wrong return code returned when stopping Hue on RHEL/SUSE
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4d088f9b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4d088f9b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4d088f9b
Branch: refs/heads/master
Commit: 4d088f9bb1c4250ef1ab5efdfc427aa80eb906a4
Parents: 896a7fa
Author: Mark Grover <gr...@gmail.com>
Authored: Thu Jan 17 16:12:11 2013 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Wed Jan 23 15:57:39 2013 -0800
----------------------------------------------------------------------
bigtop-packages/src/rpm/hue/SOURCES/hue.init | 9 ++++-----
bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse | 9 +++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4d088f9b/bigtop-packages/src/rpm/hue/SOURCES/hue.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hue/SOURCES/hue.init b/bigtop-packages/src/rpm/hue/SOURCES/hue.init
index c98c501..3d2e1b7 100644
--- a/bigtop-packages/src/rpm/hue/SOURCES/hue.init
+++ b/bigtop-packages/src/rpm/hue/SOURCES/hue.init
@@ -89,14 +89,14 @@ hue_start() {
}
hue_stop() {
- HUE_PID=`cat $PIDFILE 2>/dev/null`
-
if [ ! -e $PIDFILE ]; then
success "Hue is not running"
return 0
fi
echo -n "Shutting down hue: "
+
+ HUE_PID=`cat $PIDFILE 2>/dev/null`
if [ -n "$HUE_PID" ]; then
kill -TERM ${HUE_PID} &>/dev/null
for i in `seq 1 ${HUE_SHUTDOWN_TIMEOUT}` ; do
@@ -105,10 +105,9 @@ hue_stop() {
done
kill -KILL ${HUE_PID} &>/dev/null
fi
- ret=$?
echo
- rm -f $LOCKFILE
- return $ret
+ rm -f $LOCKFILE $PIDFILE
+ return 0
}
hue_restart() {
http://git-wip-us.apache.org/repos/asf/bigtop/blob/4d088f9b/bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse b/bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse
index 8ef67e0..7605285 100644
--- a/bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse
+++ b/bigtop-packages/src/rpm/hue/SOURCES/hue.init.suse
@@ -75,14 +75,14 @@ hue_start() {
}
hue_stop() {
- HUE_PID=`cat $PIDFILE 2>/dev/null`
-
if [ ! -e $PIDFILE ]; then
success "Hue is not running"
return 0
fi
log_success_msg "Stopping $DESC: "
+
+ HUE_PID=`cat $PIDFILE 2>/dev/null`
if [ -n "$HUE_PID" ]; then
kill -TERM ${HUE_PID} &>/dev/null
for i in `seq 1 ${HUE_SHUTDOWN_TIMEOUT}` ; do
@@ -91,9 +91,10 @@ hue_stop() {
done
kill -KILL ${HUE_PID} &>/dev/null
fi
- RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && rm -f $LOCKFILE $PIDFILE
+ rm -f $LOCKFILE $PIDFILE
+ RETVAL=0
+ return $RETVAL
}
hue_restart() {