[activemq] branch main updated: add the capability to override memory options

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new 1ba4628  add the capability to override memory options
     new ca97fd4  Merge pull request #791 from ilyesAj/patch-1
1ba4628 is described below

commit 1ba4628be6d6e05384bc49fdfb12a06cb7d97029
Author: ilyes Ajroud <il...@gmail.com>
AuthorDate: Fri Mar 4 11:11:21 2022 +0100

    add the capability to override memory options
    
    since the last release , the xmx and xms are hardcoded on `env` , the goal is to use ACTIVEMQ_OPTS_MEMORY environement variable if needed to override memory options
---
 assembly/src/release/bin/env | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env
index a31d687..87c2624 100644
--- a/assembly/src/release/bin/env
+++ b/assembly/src/release/bin/env
@@ -30,8 +30,9 @@
 # ACTIVEMQ_TMP="$ACTIVEMQ_BASE/tmp"
 
 # Set jvm memory configuration (minimal/maximum amount of memory)
-ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
-
+if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
+    ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
+fi
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
     ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
 fi