[zookeeper] 02/08: Remove support for JMXDISABLE

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository zookeeper.

commit ed60e3ec93f39cde8a27f83b4c2a3d67cfa470c0
Author: Felix Dreissig <f30 at f30.me>
Date:   Thu Jul 7 09:52:08 2016 +0200

    Remove support for JMXDISABLE
    
    It wasn't really documented for the Debian package (not used in any
    default configuration file for service start-up) and is hard to
    replicate with a systemd unit file.
---
 debian/zookeeperd.init | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/zookeeperd.init b/debian/zookeeperd.init
index e76ff27..b596cd4 100644
--- a/debian/zookeeperd.init
+++ b/debian/zookeeperd.init
@@ -112,16 +112,10 @@ do_stop()
 
 case "$1" in
   start)
-        if [ "x$JMXDISABLE" = "x" ]
-        then
-            [ "$VERBOSE" != no ] && log_action_msg "$NAME: JMX enabled by default"
-            # 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
-            JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
-        else
-            [ "$VERBOSE" != no ] && log_action_msg "$NAME: JMX disabled by user request"
-        fi
+	# For some reason, these two options are necessary on JDK6 on Ubuntu
+	# According to the docs they are not necessary, but otherwise jconsole
+	# cannot do a local attach
+	JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
 
 	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
 	do_start

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git