upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Name the log files properly. fml-junk is an early startup annoyance I can't kill because log4j2.

Browse Source
This commit is contained in:
Christian committed 2014-01-20 21:31:20 -05:00
1 parent d92176fe8c
commit 60abcb6341
3 files changed
+32 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fml/src/main/java/cpw/mods/fml/relauncher/FMLLaunchHandler.java
+2 -2
View File
@@ -62,14 +62,14 @@ public class FMLLaunchHandler
private void setupClient()
{
FMLRelaunchLog.logFileNamePattern = "ForgeModLoader-client-%g.log";
FMLRelaunchLog.side = Side.CLIENT;
side = Side.CLIENT;
setupHome();
}
private void setupServer()
{
FMLRelaunchLog.logFileNamePattern = "ForgeModLoader-server-%g.log";
FMLRelaunchLog.side = Side.SERVER;
side = Side.SERVER;
setupHome();
fml/src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java
+4 -1
View File
@@ -13,9 +13,11 @@
package cpw.mods.fml.relauncher;
import java.io.File;
import java.util.Locale;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
public class FMLRelaunchLog {
@@ -30,7 +32,7 @@ public class FMLRelaunchLog {
private Logger myLog;
static String logFileNamePattern;
static Side side;
private FMLRelaunchLog()
{
@@ -42,6 +44,7 @@ public class FMLRelaunchLog {
private static void configureLogging()
{
log.myLog = LogManager.getLogger("FML");
ThreadContext.put("side", side.name().toLowerCase(Locale.ENGLISH));
configured = true;
}
fml/src/main/resources/log4j2.xml
+26 -16
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" packages="com.mojang.util" verbose="true">
<Configuration status="debug" packages="com.mojang.util">
<Appenders>
<Console name="FmlSysOut" target="SYSTEM_OUT">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
@@ -17,33 +17,43 @@
<OnStartupTriggeringPolicy />
</Policies>
</RollingRandomAccessFile>
<RollingRandomAccessFile name="FmlFile" fileName="logs/fml-latest.log" filePattern="logs/fml-%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
<DefaultRolloverStrategy max="3" />
<Policies>
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
</Policies>
</RollingRandomAccessFile>
<Routing name="FmlFile">
<Routes pattern="$${ctx:side}">
<Route>
<RollingRandomAccessFile name="FmlFile" fileName="logs/fml-${ctx:side}-latest.log" filePattern="logs/fml-${ctx:side}-%i.log">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
<DefaultRolloverStrategy max="3" fileIndex="max" />
<Policies>
<OnStartupTriggeringPolicy />
</Policies>
</RollingRandomAccessFile>
</Route>
<Route key="$${ctx:side}">
<RandomAccessFile name="FmlFile" fileName="logs/fml-junk-earlystartup.log" >
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %msg%n" />
</RandomAccessFile>
</Route>
</Routes>
</Routing>
</Appenders>
<Loggers>
<Logger level="info" name="com.mojang" additivity="false">
<AppenderRef ref="SysOut" level="INFO"/>
<AppenderRef ref="SysOut" level="INFO" />
<AppenderRef ref="File" />
<AppenderRef ref="ServerGuiConsole" level="INFO"/>
<AppenderRef ref="ServerGuiConsole" level="INFO" />
</Logger>
<Logger level="info" name="net.minecraft" additivity="false">
<filters>
<MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
</filters>
<AppenderRef ref="SysOut" level="INFO"/>
<AppenderRef ref="SysOut" level="INFO" />
<AppenderRef ref="File" />
<AppenderRef ref="ServerGuiConsole" level="INFO"/>
<AppenderRef ref="ServerGuiConsole" level="INFO" />
</Logger>
<Root level="all">
<AppenderRef ref="FmlSysOut" level="INFO"/>
<AppenderRef ref="ServerGuiConsole" level="INFO"/>
<AppenderRef ref="FmlFile" />
<AppenderRef ref="FmlSysOut" level="INFO" />
<AppenderRef ref="ServerGuiConsole" level="INFO" />
<AppenderRef ref="FmlFile"/>
</Root>
</Loggers>
</Configuration>