Cleaner fix for: ARTEMIS-318 Can't stop broker when remote JMX enabled
This commit is contained in:
parent
8c0aa41db0
commit
044e8e1159
|
@ -105,11 +105,6 @@ if $cygwin ; then
|
|||
CLASSPATH=`cygpath --windows "$CLASSPATH"`
|
||||
fi
|
||||
|
||||
# Empty JAVA_ARGS unless the command is 'run' or 'data'. See https://issues.apache.org/jira/browse/ARTEMIS-318.
|
||||
if [ "$1" != "run" -a "$1" != "data" ]; then
|
||||
JAVA_ARGS=""
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
|
||||
-classpath "$CLASSPATH" \
|
||||
-Dartemis.home="$ARTEMIS_HOME" \
|
||||
|
|
|
@ -22,10 +22,15 @@ ARTEMIS_INSTANCE='${artemis.instance}'
|
|||
#ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
|
||||
|
||||
|
||||
|
||||
# Java Opts
|
||||
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} -Djava.security.auth.login.config=$ARTEMIS_INSTANCE/etc/login.config ${java-opts} -Dartemis.instance=$ARTEMIS_INSTANCE"
|
||||
|
||||
#
|
||||
# There might be options that you only want to enable on specifc commands, like setting a JMX port
|
||||
# See https://issues.apache.org/jira/browse/ARTEMIS-318
|
||||
#if [ "$1" == "run" ]; then
|
||||
# JAVA_ARGS="$JAVA_ARGS -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
|
||||
#fi
|
||||
|
||||
# Debug args: Uncomment to enable debug
|
||||
#DEBUG_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
|
||||
|
|
|
@ -24,5 +24,9 @@ rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.
|
|||
rem Java Opts
|
||||
set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config ${java-opts} -Dartemis.instance=%ARTEMIS_INSTANCE%
|
||||
|
||||
rem There might be options that you only want to enable on specifc commands, like setting a JMX port
|
||||
rem See https://issues.apache.org/jira/browse/ARTEMIS-318
|
||||
rem if "%1"=="run" set JAVA_ARGS=%JAVA_ARGS% -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false
|
||||
|
||||
rem Debug args: Uncomment to enable debug
|
||||
rem set DEBUG_ARGS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
|
||||
|
|
Loading…
Reference in New Issue