Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.springframework.boot from 3.1.2 to 3.1.3 #3026

Merged
merged 2 commits into from
Sep 18, 2023
Merged

Bump org.springframework.boot from 3.1.2 to 3.1.3 #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0af113b
Bump org.springframework.boot from 3.1.2 to 3.1.3
dependabot[bot] Sep 18, 2023
c924621
Fix removed logging message issue
Sheikah45 Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id 'org.springframework.boot' version '3.1.2'
id 'org.springframework.boot' version '3.1.3'
id "com.install4j.gradle" version "10.0.6"
id "de.undercouch.download" version "5.5.0"
id 'jacoco'
Expand Down
52 changes: 25 additions & 27 deletions src/main/java/com/faforever/client/logging/LoggingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.faforever.client.logging;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.util.ContextInitializer;
import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException;
import com.faforever.client.fx.JavaFxUtil;
import com.faforever.client.os.OperatingSystem;
Expand All @@ -13,11 +12,12 @@
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.logging.LogLevel;
import org.springframework.boot.logging.LoggingSystem;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
Expand Down Expand Up @@ -60,11 +60,11 @@ public void afterPropertiesSet() throws IOException, InterruptedException, Joran
.resolve("irc.log")
.toString());

LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
loggerContext.reset();

ContextInitializer ci = new ContextInitializer(loggerContext);
ci.configureByResource(LoggingService.class.getResource("/logback-spring.xml"));
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
context.reset();
JoranConfigurator configurator = new JoranConfigurator();
configurator.setContext(context);
configurator.doConfigure(this.getClass().getResourceAsStream("/logback-spring.xml"));

JavaFxUtil.addAndTriggerListener(developerPrefs.logLevelProperty(), new WeakChangeListener<>(logLevelChangeListener));
}
Expand Down Expand Up @@ -99,26 +99,24 @@ public Optional<Path> getMostRecentGameLogFile() {
}

public void setLoggingLevel(String level) {
Level targetLogLevel = Level.toLevel(level);
final LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(MethodHandles.lookup().lookupClass())).getLoggerContext();
loggerContext.getLoggerList()
.stream()
.filter(logger -> logger.getName().startsWith("com.faforever"))
.forEach(logger -> ((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(logger.getName())).setLevel(targetLogLevel));

LogLevel targetLogLevel = switch (level) {
case "TRACE" -> LogLevel.TRACE;
case "DEBUG" -> LogLevel.DEBUG;
case "WARN" -> LogLevel.WARN;
case "ERROR" -> LogLevel.ERROR;
default -> LogLevel.INFO;
};
log.info("Switching FA Forever logging configuration to {}", targetLogLevel);
if (Level.TRACE.equals(targetLogLevel)) {
log.trace("Confirming trace logging");
} else if (Level.DEBUG.equals(targetLogLevel)) {
log.debug("Confirming debug logging");
} else if (Level.INFO.equals(targetLogLevel)) {
log.info("Confirming info logging");
} else if (Level.WARN.equals(targetLogLevel)) {
log.warn("Confirming warn logging");
} else if (Level.ERROR.equals(targetLogLevel)) {
log.error("Confirming error logging");
} else {
log.error("Unknown log level set");
LoggingSystem loggingSystem = LoggingSystem.get(LoggingService.class.getClassLoader());
loggingSystem.getLoggerConfigurations().stream().filter(config -> config.getName().startsWith("com.faforever"))
.forEach(config -> loggingSystem.setLogLevel(config.getName(), targetLogLevel));

switch (targetLogLevel) {
case TRACE -> log.trace("Confirming trace logging");
case DEBUG -> log.debug("Confirming debug logging");
case INFO -> log.info("Confirming info logging");
case WARN -> log.warn("Confirming warn logging");
case ERROR -> log.error("Confirming error logging");
}
}
}