mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-21 22:32:39 +00:00
Leverage ENABLE_ROLLING_LOGS as default for GENERATE_LOG4J2_CONFIG (#3860)
This commit is contained in:
1 parent
f8ff8a7b8a
commit
c23654008b
1 file changed
+1
-5
@@ -47,7 +47,7 @@ if [ -n "$ICON" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-false}
|
useGeneratedLogs=${GENERATE_LOG4J2_CONFIG:-${ENABLE_ROLLING_LOGS:-false}}
|
||||||
useFallbackJvmFlag=false
|
useFallbackJvmFlag=false
|
||||||
|
|
||||||
SERVER_DIR="$baseDataDir"
|
SERVER_DIR="$baseDataDir"
|
||||||
@@ -172,10 +172,6 @@ EOF
|
|||||||
|
|
||||||
# Apply the log4j2 configuration
|
# Apply the log4j2 configuration
|
||||||
JVM_OPTS="-Dlog4j.configurationFile=log4j2.xml ${JVM_OPTS}"
|
JVM_OPTS="-Dlog4j.configurationFile=log4j2.xml ${JVM_OPTS}"
|
||||||
elif isTrue "${ENABLE_ROLLING_LOGS:-false}"; then
|
|
||||||
# Legacy behavior: error if rolling logs explicitly requested but not possible
|
|
||||||
logError "Using rolling logs is currently not possible in the selected version due to CVE-2021-44228"
|
|
||||||
exit 1
|
|
||||||
else
|
else
|
||||||
rm -f "${LOGFILE}"
|
rm -f "${LOGFILE}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in new issue
Block a user