mirror of https://github.com/apache/activemq.git
https://issues.apache.org/jira/browse/AMQ-5128 - provide SSL_OPTS to all tasks
This commit is contained in:
parent
d77014aa5d
commit
f5ddcf06d7
|
@ -621,16 +621,14 @@ invoke_stop(){
|
|||
# - $ACTIVEMQ_SUNJMX_START : options for JMX settings
|
||||
# - $ACTIVEMQ_SSL_OPTS : options for SSL encryption
|
||||
invoke_task(){
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS"
|
||||
# call task in java binary
|
||||
if ( checkRunning );then
|
||||
if [ "$1" = "browse" ] && [ -n "$ACTIVEMQ_QUEUEMANAGERURL" ];then
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS"
|
||||
COMMANDLINE_ARGS="$1 $ACTIVEMQ_QUEUEMANAGERURL `echo $COMMANDLINE_ARGS|sed 's,^browse,,'`"
|
||||
elif [ "$1" = "query" ] && [ -n "$ACTIVEMQ_QUEUEMANAGERURL" ];then
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS"
|
||||
COMMANDLINE_ARGS="$1 $ACTIVEMQ_SUNJMX_CONTROL `echo $COMMANDLINE_ARGS|sed 's,^query,,'`"
|
||||
else
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS"
|
||||
COMMANDLINE_ARGS="$COMMANDLINE_ARGS $ACTIVEMQ_SUNJMX_CONTROL"
|
||||
fi
|
||||
invokeJar
|
||||
|
|
|
@ -156,9 +156,11 @@ if [ ""$1 = "start" ] ; then
|
|||
SUNJMX="-Dcom.sun.management.jmxremote"
|
||||
fi
|
||||
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS -Djava.io.tmpdir="${ACTIVEMQ_TMP}""
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX -Djava.io.tmpdir="${ACTIVEMQ_TMP}""
|
||||
fi
|
||||
|
||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SSL_OPTS"
|
||||
|
||||
# Uncomment to enable YourKit profiling
|
||||
#ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
|
||||
|
||||
|
|
Loading…
Reference in New Issue