ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: fix logback config to log messages from threads

Browse Source 
This removes the sifting appender which I think is unnecessary.
This commit is contained in:
Adam
2018-12-08 18:33:49 -05:00
parent c9a814d20f
commit e83e5024ce
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -67,7 +67,6 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxOverlay;
import net.runelite.client.ui.overlay.tooltip.TooltipOverlay; import net.runelite.client.ui.overlay.tooltip.TooltipOverlay;
import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay; import net.runelite.client.ui.overlay.worldmap.WorldMapOverlay;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@Singleton @Singleton
@Slf4j @Slf4j
@@ -76,8 +75,6 @@ public class RuneLite
public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite"); public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite");
public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles"); public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles");
public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots"); public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots");
private static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
private static final File LOGS_FILE_NAME = new File(LOGS_DIR, "application");
@Getter @Getter
private static Injector injector; private static Injector injector;
@@ -194,9 +191,6 @@ public class RuneLite
PROFILES_DIR.mkdirs(); PROFILES_DIR.mkdirs();
// Setup logger
MDC.put("logFileName", LOGS_FILE_NAME.getAbsolutePath());
if (options.has("debug")) if (options.has("debug"))
{ {
final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);

42
runelite-client/src/main/resources/logback.xml
View File

@@ -30,39 +30,29 @@
</encoder> </encoder>
</appender> </appender>
<appender name="FILE" class="ch.qos.logback.classic.sift.SiftingAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- discriminator is used for setting up the log file from code --> <file>${user.home}/.runelite/logs/client.log</file>
<discriminator>
<key>logFileName</key>
<defaultValue>${user.home}/.runelite/logs/application</defaultValue>
</discriminator>
<sift>
<appender name="FILE-${logFileName}" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- default file to log to -->
<file>${logFileName}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- daily rollover --> <!-- daily rollover -->
<fileNamePattern>${logFileName}_%d{yyyy-MM-dd}.%i.log</fileNamePattern> <fileNamePattern>client_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<!-- when file size is larger than defined, roll to new file --> <!-- when file size is larger than defined, roll to new file -->
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize> <maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy> </timeBasedFileNamingAndTriggeringPolicy>
<!-- keep 30 days' worth of history --> <!-- keep 30 days' worth of history -->
<maxHistory>30</maxHistory> <maxHistory>30</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<Pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</Pattern> <Pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</Pattern>
</encoder> </encoder>
</appender>
</sift>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT"/>
<appender-ref ref="FILE"/> <appender-ref ref="FILE"/>
</root> </root>
</configuration> </configuration>