Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enhance crash reports and logging to capture transformers on stack tr…
…ace elements. Moved log4j2.xml file to the launcher source set, so it loads first in the client. Signed-off-by: cpw <cpw+github@weeksfamily.ca>
- Loading branch information
Showing
10 changed files
with
152 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
src/fmllauncher/java/net/minecraftforge/fml/loading/ModDirTransformerDiscoverer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package net.minecraftforge.fml.loading; | ||
|
|
||
| import cpw.mods.modlauncher.api.LamdbaExceptionUtils; | ||
| import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService; | ||
| import org.apache.logging.log4j.LogManager; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.zip.ZipFile; | ||
|
|
||
| public class ModDirTransformerDiscoverer implements ITransformerDiscoveryService { | ||
| @Override | ||
| public List<Path> candidates(final Path gameDirectory) { | ||
| final Path modsDir = gameDirectory.resolve(FMLPaths.MODSDIR.relative()); | ||
| List<Path> paths = new ArrayList<>(); | ||
| try { | ||
| Files.walk(modsDir, 1).forEach(p -> { | ||
| if (!Files.isRegularFile(p)) return; | ||
| if (!p.toString().endsWith(".jar")) return; | ||
| if (LamdbaExceptionUtils.uncheck(()->Files.size(p)) == 0) return; | ||
| try (ZipFile zf = new ZipFile(new File(p.toUri()))) { | ||
| if (zf.getEntry("META-INF/services/cpw.mods.modlauncher.api.ITransformationService") != null) { | ||
| paths.add(p); | ||
| } | ||
| } catch (IOException ioe) { | ||
| LogManager.getLogger().error("Zip Error when loading jar file {}", p, ioe); | ||
| } | ||
| }); | ||
| } catch (IOException | IllegalStateException ioe) { | ||
| LogManager.getLogger().error("Error during early discovery", ioe); | ||
| } | ||
| return paths; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
.../resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| net.minecraftforge.fml.loading.ModDirTransformerDiscoverer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log"> | ||
| <filters> | ||
| <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="NETWORK_PACKETS" onMatch="${sys:forge.logging.marker.networking:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="CLASSLOADING" onMatch="${sys:forge.logging.marker.classloading:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="LAUNCHPLUGIN" onMatch="${sys:forge.logging.marker.launchplugin:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="CLASSDUMP" onMatch="${sys:forge.logging.marker.classdump:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="AXFORM" onMatch="${sys:forge.logging.marker.axform:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="EVENTBUS" onMatch="${sys:forge.logging.marker.eventbus:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="DISTXFORM" onMatch="${sys:forge.logging.marker.distxform:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="SCAN" onMatch="${sys:forge.logging.marker.scan:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="REGISTRIES" onMatch="${sys:forge.logging.marker.registries:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="REGISTRYDUMP" onMatch="${sys:forge.logging.marker.registrydump:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="SPLASH" onMatch="${sys:forge.logging.marker.splash:-DENY}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="FORGEMOD" onMatch="${sys:forge.logging.marker.forgemod:-ACCEPT}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="LOADING" onMatch="${sys:forge.logging.marker.loading:-ACCEPT}" onMismatch="NEUTRAL"/> | ||
| <MarkerFilter marker="CORE" onMatch="${sys:forge.logging.marker.core:-ACCEPT}" onMismatch="NEUTRAL"/> | ||
| </filters> | ||
| <Appenders> | ||
| <TerminalConsole name="Console"> | ||
| <PatternLayout> | ||
| <LoggerNamePatternSelector defaultPattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}" disableAnsi="${sys:forge.logging.noansi:-true}"> | ||
| <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose --> | ||
| <PatternMatch key="net.minecraft." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/> | ||
| <PatternMatch key="com.mojang." pattern="%highlight{[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}"/> | ||
| </LoggerNamePatternSelector> | ||
| </PatternLayout> | ||
| </TerminalConsole> | ||
| <Queue name="ServerGuiConsole" ignoreExceptions="true"> | ||
| <PatternLayout> | ||
| <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss.SSS}] [%t/%level] [%c{2.}/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n"> | ||
| <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose --> | ||
| <PatternMatch key="net.minecraft." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/> | ||
| <PatternMatch key="com.mojang." pattern="[%d{HH:mm:ss.SSS}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}{strip}%n"/> | ||
| </LoggerNamePatternSelector> | ||
| </PatternLayout> | ||
| </Queue> | ||
| <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> | ||
| <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/> | ||
| <Policies> | ||
| <TimeBasedTriggeringPolicy/> | ||
| <OnStartupTriggeringPolicy/> | ||
| </Policies> | ||
| </RollingRandomAccessFile> | ||
| <RollingRandomAccessFile name="DebugFile" fileName="logs/debug.log" filePattern="logs/debug-%i.log.gz"> | ||
| <PatternLayout pattern="[%d{ddMMMyyyy HH:mm:ss.SSS}] [%t/%level] [%logger/%markerSimpleName]: %minecraftFormatting{%msg}{strip}%n%xEx"/> | ||
| <Policies> | ||
| <OnStartupTriggeringPolicy/> | ||
| <SizeBasedTriggeringPolicy size="200MB"/> | ||
| </Policies> | ||
| <DefaultRolloverStrategy max="5" fileIndex="min"/> | ||
| </RollingRandomAccessFile> | ||
| </Appenders> | ||
| <Loggers> | ||
| <!-- make sure mojang's logging is set to 'info' so that their LOGGER.isDebugEnabled() behavior isn't active --> | ||
| <Logger level="${sys:forge.logging.mojang.level:-info}" name="com.mojang"/> | ||
| <Logger level="${sys:forge.logging.mojang.level:-info}" name="net.minecraft"/> | ||
| <Logger level="${sys:forge.logging.classtransformer.level:-info}" name="cpw.mods.modlauncher.ClassTransformer"/> | ||
| <Root level="all"> | ||
| <AppenderRef ref="Console" level="${sys:forge.logging.console.level:-info}"/> | ||
| <AppenderRef ref="ServerGuiConsole" level="${sys:forge.logging.console.level:-info}"/> | ||
| <AppenderRef ref="File" level="${sys:forge.logging.file.level:-info}"/> | ||
| <AppenderRef ref="DebugFile" level="${sys:forge.logging.debugFile.level:-trace}"/> | ||
| </Root> | ||
| </Loggers> | ||
| </Configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters