Начинаем переход на SLF4j+Log4j2
This commit is contained in:
@@ -18,10 +18,15 @@ if (OperatingSystem.current().isWindows()) {
|
||||
} else if (OperatingSystem.current().isLinux()) {
|
||||
platform = 'linux'
|
||||
}
|
||||
def slf4jVersion = '1.7.21'
|
||||
def log4jVersion = '2.5'
|
||||
|
||||
dependencies {
|
||||
compile (['org.lwjgl.lwjgl:lwjgl:' + lwjgl_ver],
|
||||
['org.lwjgl.lwjgl:lwjgl_util:' + lwjgl_ver])
|
||||
compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
|
||||
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
|
||||
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
13
resources/log4j2.xml
Normal file
13
resources/log4j2.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration>
|
||||
<Appenders>
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] (%t) \{%logger{36}\} %msg%n"/>
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="all">
|
||||
<AppenderRef ref="Console"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
@@ -22,6 +22,8 @@ import lwjake2.Defines;
|
||||
import lwjake2.Globals;
|
||||
import lwjake2.client.CL;
|
||||
import lwjake2.qcommon.Com;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
@@ -32,6 +34,7 @@ import java.util.regex.PatternSyntaxException;
|
||||
* Sys
|
||||
*/
|
||||
public final class Sys extends Defines {
|
||||
private static final Logger logger = LoggerFactory.getLogger(Sys.class);
|
||||
|
||||
public static void Error(String error) {
|
||||
|
||||
@@ -230,7 +233,14 @@ public final class Sys extends Defines {
|
||||
if (Globals.nostdout != null && Globals.nostdout.value != 0)
|
||||
return;
|
||||
|
||||
System.out.print(msg);
|
||||
while (msg.startsWith("\n")) {
|
||||
msg = msg.substring(1);
|
||||
}
|
||||
while (msg.endsWith("\n")) {
|
||||
msg = msg.substring(0, msg.lastIndexOf("\n"));
|
||||
}
|
||||
|
||||
logger.info(msg);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user