Ticket #26872: zkServer.sh.patch

bin/zkServer.sh

@@ -32 +32 @@
 
 if [ "x$JMXDISABLE" = "x" ]
 then
-    echo "JMX enabled by default"
+    echo "JMX enabled by default" >&2
     # for some reason these two options are necessary on jdk6 on Ubuntu
     #   accord to the docs they are not necessary, but otw jconsole cannot
     #   do a local attach
     ZOOMAIN="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY org.apache.zookeeper.server.quorum.QuorumPeerMain"
 else
-    echo "JMX disabled by user request"
+    echo "JMX disabled by user request" >&2
     ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
 fi
 
 # Only follow symlinks if readlink supports it
+# macos's readlink doesn't have -f
 if readlink -f "$0" > /dev/null 2>&1
 then
-  ZOOBIN=`readlink -f "$0"`
+  READLINK="readlink -f"
+else
+  READLINK="readlink"
+fi
+
+if $READLINK "$0" > /dev/null 2>&1
+then
+  ZOOBIN=`$READLINK "$0"`
 else
   ZOOBIN="$0"
 fi
@@ -58 +66 @@
     ZOOCFG="$ZOOCFGDIR/$2"
 fi
 
+# if we're given a more complicated path to the config
+# don't assume it lives in $ZOOCFGDIR, just use it
+if [ ! -z "$2" ]
+then
+  if [ "`basename $2`" != "$2" ]
+  then
+    ZOOCFG="$2"
+  fi
+fi
+
 if $cygwin
 then
     ZOOCFG=`cygpath -wp "$ZOOCFG"`
@@ -67 +85 @@
     KILL=kill
 fi
 
-echo "Using config: $ZOOCFG"
+echo "Using config: $ZOOCFG" >&2
 
 ZOOPIDFILE=$(grep dataDir "$ZOOCFG" | sed -e 's/.*=//')/zookeeper_server.pid
 
@@ -80 +98 @@
     /bin/echo -n $! > "$ZOOPIDFILE"
     echo STARTED
     ;;
+start-foreground)
+    java  "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+    -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG"
+    ;;
+print-cmd)
+    echo "java -Dzookeeper.log.dir=\"${ZOO_LOG_DIR}\" -Dzookeeper.root.logger=\"${ZOO_LOG4J_PROP}\" -cp \"$CLASSPATH\" $JVMFLAGS $ZOOMAIN \"$ZOOCFG\""
+    ;;
 stop)
     echo "Stopping zookeeper ... "
     if [ ! -f "$ZOOPIDFILE" ]