Skip to content

Commit c236540

Browse files
authored
Leverage ENABLE_ROLLING_LOGS as default for GENERATE_LOG4J2_CONFIG (#3860)
1 parent f8ff8a7 commit c236540

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

scripts/start-finalExec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ -n "$ICON" ]; then
4747
fi
4848
fi
4949

50-
useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-false}
50+
useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-${ENABLE_ROLLING_LOGS:-false}}
5151
useFallbackJvmFlag=false
5252

5353
SERVER_DIR="$baseDataDir"
@@ -172,10 +172,6 @@ EOF
172172

173173
# Apply the log4j2 configuration
174174
JVM_OPTS="-Dlog4j.configurationFile=log4j2.xml ${JVM_OPTS}"
175-
elif isTrue "${ENABLE_ROLLING_LOGS:-false}"; then
176-
# Legacy behavior: error if rolling logs explicitly requested but not possible
177-
logError "Using rolling logs is currently not possible in the selected version due to CVE-2021-44228"
178-
exit 1
179175
else
180176
rm -f "${LOGFILE}"
181177
fi

0 commit comments

Comments
 (0)