GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Bump logj4 (#3888)

Browse source
This commit is contained in:
Konicai 2023-06-17 11:47:42 -04:00 committed by GitHub
parent f272ed9383
commit bed7b5d10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap/standalone/build.gradle.kts
View file

@ -7,10 +7,8 @@ dependencies {
api(projects.core) api(projects.core)
implementation(libs.terminalconsoleappender) { implementation(libs.terminalconsoleappender) {
exclude("org.apache.logging.log4j", "log4j-core") exclude("org.apache.logging.log4j")
exclude("org.jline", "jline-reader") exclude("org.jline")
exclude("org.jline", "jline-terminal")
exclude("org.jline", "jline-terminal-jna")
} }
implementation(libs.bundles.jline) implementation(libs.bundles.jline)

1
bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java
View file

@ -92,6 +92,7 @@ public class GeyserStandaloneLogger extends SimpleTerminalConsole implements Gey
Configurator.setLevel(log.getName(), debug ? Level.DEBUG : Level.INFO); Configurator.setLevel(log.getName(), debug ? Level.DEBUG : Level.INFO);
} }
@Override
public boolean isDebug() { public boolean isDebug() {
return log.isDebugEnabled(); return log.isDebugEnabled();
} }

4
bootstrap/standalone/src/main/resources/log4j2.xml
View file

@ -2,10 +2,10 @@
<Configuration status="WARN"> <Configuration status="WARN">
<Appenders> <Appenders>
<TerminalConsole name="TerminalConsole"> <TerminalConsole name="TerminalConsole">
<PatternLayout pattern="[%d{HH:mm:ss} %style{%highlight{%level}{FATAL=red dark, ERROR=red, WARN=yellow bright, INFO=cyan bright, DEBUG=green, TRACE=white}}] %minecraftFormatting{%msg}%n"/> <PatternLayout pattern="[%d{HH:mm:ss} %style{%highlight{%level}{FATAL=red, ERROR=red, WARN=yellow bright, INFO=cyan bright, DEBUG=green, TRACE=white}}] %minecraftFormatting{%msg}%n"/>
</TerminalConsole> </TerminalConsole>
<Console name="Console" target="SYSTEM_OUT" follow="true"> <Console name="Console" target="SYSTEM_OUT" follow="true">
<PatternLayout pattern="[%d{HH:mm:ss} %style{%highlight{%level}{FATAL=red dark, ERROR=red, WARN=yellow bright, INFO=cyan bright, DEBUG=green, TRACE=white}}] %minecraftFormatting{%msg}%n"/> <PatternLayout pattern="[%d{HH:mm:ss} %style{%highlight{%level}{FATAL=red, ERROR=red, WARN=yellow bright, INFO=cyan bright, DEBUG=green, TRACE=white}}] %minecraftFormatting{%msg}%n"/>
</Console> </Console>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="[%d{HH:mm:ss.SSS} %t/%level] %minecraftFormatting{%msg}{strip}%n"/> <PatternLayout pattern="[%d{HH:mm:ss.SSS} %t/%level] %minecraftFormatting{%msg}{strip}%n"/>

6
gradle/libs.versions.toml
View file

@ -18,7 +18,7 @@ adventure = "4.14.0-20230424.215040-7"
adventure-platform = "4.1.2" adventure-platform = "4.1.2"
junit = "5.9.2" junit = "5.9.2"
checkerframework = "3.19.0" checkerframework = "3.19.0"
log4j = "2.17.1" log4j = "2.20.0"
jline = "3.21.0" jline = "3.21.0"
terminalconsoleappender = "1.2.0" terminalconsoleappender = "1.2.0"
folia = "1.19.4-R0.1-SNAPSHOT" folia = "1.19.4-R0.1-SNAPSHOT"
@ -65,7 +65,7 @@ netty-transport-native-kqueue = { group = "io.netty", name = "netty-transport-na
log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
log4j-slf4j18-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j18-impl", version.ref = "log4j" } log4j-slf4j2-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" }
jline-terminal = { group = "org.jline", name = "jline-terminal", version.ref = "jline" } jline-terminal = { group = "org.jline", name = "jline-terminal", version.ref = "jline" }
jline-terminal-jna = { group = "org.jline", name = "jline-terminal-jna", version.ref = "jline" } jline-terminal-jna = { group = "org.jline", name = "jline-terminal-jna", version.ref = "jline" }
@ -103,6 +103,6 @@ protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-con
jackson = [ "jackson-annotations", "jackson-core", "jackson-dataformat-yaml" ] jackson = [ "jackson-annotations", "jackson-core", "jackson-dataformat-yaml" ]
fastutil = [ "fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps" ] fastutil = [ "fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps" ]
adventure = [ "adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain" ] adventure = [ "adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain" ]
log4j = [ "log4j-api", "log4j-core", "log4j-slf4j18-impl" ] log4j = [ "log4j-api", "log4j-core", "log4j-slf4j2-impl" ]
jline = [ "jline-terminal", "jline-terminal-jna", "jline-reader" ] jline = [ "jline-terminal", "jline-terminal-jna", "jline-reader" ]
protocol = [ "protocol-common", "protocol-codec", "protocol-connection" ] protocol = [ "protocol-common", "protocol-codec", "protocol-connection" ]