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.

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

Support setting status listener for logback generator #319

Merged
merged 2 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
fetch-depth: 0

- name: "🔧 Setup GraalVM CE"
uses: graalvm/setup-graalvm@v1.2.3
uses: graalvm/setup-graalvm@v1.2.4
with:
distribution: 'graalvm'
java-version: ${{ matrix.java }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import ch.qos.logback.core.model.ImplicitModel;
import ch.qos.logback.core.model.Model;
import ch.qos.logback.core.model.NamedComponentModel;
import ch.qos.logback.core.model.StatusListenerModel;
import ch.qos.logback.core.net.ssl.KeyManagerFactoryFactoryBean;
import ch.qos.logback.core.net.ssl.KeyStoreFactoryBean;
import ch.qos.logback.core.net.ssl.SSLConfiguration;
Expand Down Expand Up @@ -273,6 +274,19 @@ public void postVisitLoggerContextListener(LoggerContextListenerModel model, Mod
codeBuilder.addStatement("loggerContext.addListener($L)", loggerContextListenerVarName);
}

@Override
public void visitStatusListener(StatusListenerModel model, Model parent) {
String varName = varNameOf(model); // Will always be "statuslistener"
Class<?> type;
try {
type = Class.forName(model.getClassName());
} catch (ClassNotFoundException e) {
throw new IllegalStateException("Could not find " + model.getClassName() + " on the AOT processor classpath", e);
}
codeBuilder.addStatement(CodeBlock.of("$T $L = new $T()", type, varName, type));
codeBuilder.addStatement("loggerContext.getStatusManager().add($L)", varName);
}

private void collectAppenders(Model model, String loggerVarName) {
Set<String> appenders = model.getSubModels().stream()
.filter(AppenderRefModel.class::isInstance)
Expand Down Expand Up @@ -399,6 +413,9 @@ default void preVisit(Model model, Model parent) {
if (model instanceof LoggerContextListenerModel loggerContextListenerModel) {
visitLoggerContextListener(loggerContextListenerModel, parent);
}
if (model instanceof StatusListenerModel statusListenerModel) {
visitStatusListener(statusListenerModel, parent);
}
}

default void postVisit(Model model, Model parent) {
Expand Down Expand Up @@ -458,6 +475,9 @@ default void visitLoggerContextListener(LoggerContextListenerModel model, Model
default void postVisitLoggerContextListener(LoggerContextListenerModel model, Model parent) {
}

default void visitStatusListener(StatusListenerModel model, Model parent) {
}

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.Configurator;
import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.status.OnErrorConsoleStatusListener;
import ch.qos.logback.core.status.Status;
import java.lang.String;
import java.lang.Throwable;
Expand All @@ -54,6 +55,10 @@ public class StaticLogbackConfiguration implements Configurator {
private Context context;

public Configurator.ExecutionStatus configure(LoggerContext loggerContext) {
OnErrorConsoleStatusListener statuslistener = new OnErrorConsoleStatusListener();
loggerContext.getStatusManager().add(statuslistener);
statuslistener.setContext(context);
statuslistener.start();
ConsoleAppender stdout = new ConsoleAppender();
stdout.setWithJansi(true);
PatternLayoutEncoder encoder = new PatternLayoutEncoder();
Expand Down
2 changes: 2 additions & 0 deletions aot-std-optimizers/src/test/resources/logback-test1.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<configuration>

<statusListener class="ch.qos.logback.core.status.OnErrorConsoleStatusListener" />

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
Expand Down
Loading