Browse Source

ZOOKEEPER-1212. zkServer.sh stop action is not conformat with LSB para 20.2 Init Script Actions (Roman Shaposhnik via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1179336 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 13 years ago
parent
commit
a83e0382c1
2 changed files with 5 additions and 3 deletions
  1. 3 0
      CHANGES.txt
  2. 2 3
      bin/zkServer.sh

+ 3 - 0
CHANGES.txt

@@ -23,6 +23,9 @@ BUGFIXES:
   ZOOKEEPER-1206. Sequential node creation does not use always use
   digits in node name given certain Locales. (Mark Miller via phunt)
 
+  ZOOKEEPER-1212. zkServer.sh stop action is not conformat with LSB
+  para 20.2 Init Script Actions (Roman Shaposhnik via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

+ 2 - 3
bin/zkServer.sh

@@ -130,14 +130,13 @@ stop)
     echo -n "Stopping zookeeper ... "
     if [ ! -f "$ZOOPIDFILE" ]
     then
-      echo "error: could not find file $ZOOPIDFILE"
-      exit 1
+      echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
     else
       $KILL -9 $(cat "$ZOOPIDFILE")
       rm "$ZOOPIDFILE"
       echo STOPPED
-      exit 0
     fi
+    exit 0
     ;;
 upgrade)
     shift