Better java opts handling

This commit is contained in:
Daniel Berteaud 2024-02-01 00:09:54 +01:00
parent 26167ab5d5
commit f962c178b7

View File

@ -20,14 +20,6 @@ get_max_mem(){
fi
}
if [ -z "${JVM_XMX}" ]; then
MIN_FREE_MEM=$(printf "%.0f" $(echo $(get_max_mem)*0.40 | bc))
[ ${MIN_FREE_MEM} -gt 3072 ] && MIN_FREE_MEM=3072
export JVM_XMX=$(echo $(get_max_mem)-${MIN_FREE_MEM} | bc)m
fi
export JVM_XMX=${JVM_XMX:-64m}
export JVM_XSS=${JVM_XSS:-512k}
if [ -n "${TMPDIR}" ]; then
[ -d "${TMPDIR}" ] || mkdir -p ${TMPDIR}
JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=${TMPDIR}"
@ -35,6 +27,10 @@ fi
JAVA_OPTS="${JAVA_OPTS} -Xshare:off -Djava.awt.headless=true -Dfile.encoding=UTF8"
if [ -z "${JVM_XMX}" ]; then
export JVM_XMX=$(printf "%.0f" $(echo $(get_max_mem)*${JVM_XMX_RATIO} | bc))m
fi
if [ -n "${JVM_MAXRAM}" ]; then
JAVA_OPTS="${JAVA_OPTS} -XX:MaxRAM=${JVM_MAXRAM}"
if [ -n "${JVM_MINRAM_PERCENTAGE}" ]; then
@ -44,7 +40,15 @@ if [ -n "${JVM_MAXRAM}" ]; then
JAVA_OPTS="${JAVA_OPTS} -XX:MaxRAMPercentage=${JVM_MAXRAM_PERCENTAGE}"
fi
else
JAVA_OPTS="${JAVA_OPTS} -Xmx${JVM_XMX} -Xss${JVM_XSS}"
if [ -n "${JVM_XMX}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Xmx${JVM_XMX}"
fi
if [ -n "${JVM_XMS}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Xms${JVM_XMS}"
fi
if [ -n "${JVM_XSS}" ]; then
JAVA_OPTS="${JAVA_OPTS} -Xss${JVM_XSS}"
fi
fi
if [ -n "${HTTP_MAX_CONNECTIONS}" ]; then