mirror of https://github.com/apache/activemq.git
setting ACTIVEMQ_OPTS after loading configs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
aa24935f7b
commit
2ebdadabc9
|
@ -121,10 +121,6 @@ if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
|
||||||
ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
|
ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$ACTIVEMQ_OPTS" ] ; then
|
|
||||||
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Uncomment to enable audit logging
|
# Uncomment to enable audit logging
|
||||||
#ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true"
|
#ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true"
|
||||||
|
|
||||||
|
@ -214,6 +210,10 @@ if [ "$CONFIG_LOAD" != "yes" ];then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$ACTIVEMQ_OPTS" ] ; then
|
||||||
|
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
|
||||||
|
fi
|
||||||
|
|
||||||
# create configuration if requested
|
# create configuration if requested
|
||||||
if [ "$1" = "setup" ];then
|
if [ "$1" = "setup" ];then
|
||||||
if [ -z "$2" ];then
|
if [ -z "$2" ];then
|
||||||
|
|
Loading…
Reference in New Issue