Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish SystemStatusListener

Browse Source 
See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
This commit is contained in:
Dmytro Nosan
2025-01-28 21:40:23 +02:00
committed by Phillip Webb
parent 8e15317e89
commit 4878fc2a28
1 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SystemStatusListener.java
View File

@@ -24,14 +24,13 @@ import ch.qos.logback.core.BasicStatusManager;
import ch.qos.logback.core.status.OnConsoleStatusListener;
import ch.qos.logback.core.status.Status;
import ch.qos.logback.core.status.StatusListener;
import ch.qos.logback.core.status.StatusManager;
import ch.qos.logback.core.util.StatusPrinter2;
import ch.qos.logback.core.util.StatusListenerConfigHelper;
/**
* {@link StatusListener} used to print appropriate status messages to {@link System#out}
* or {@link System#err}. Note that this class extends {@link OnConsoleStatusListener} so
* that {@link BasicStatusManager#add(StatusListener)} does not add the same listener
* twice. It also implement a version of retrospectivePrint that can filter status
* twice. It also implements a version of retrospectivePrint that can filter status
* messages by level.
*
* @author Dmytro Nosan
@@ -41,8 +40,6 @@ final class SystemStatusListener extends OnConsoleStatusListener {
static final long RETROSPECTIVE_THRESHOLD = 300;
private static final StatusPrinter2 PRINTER = new StatusPrinter2();
private final boolean debug;
private SystemStatusListener(boolean debug) {
@@ -63,53 +60,33 @@ final class SystemStatusListener extends OnConsoleStatusListener {
}
long now = System.currentTimeMillis();
List<Status> statusList = this.context.getStatusManager().getCopyOfStatusList();
statusList.stream().filter((status) -> isPrintable(status, now)).forEach(this::print);
}
private void print(Status status) {
StringBuilder sb = new StringBuilder();
PRINTER.buildStr(sb, "", status);
getPrintStream().print(sb);
statusList.stream()
.filter((status) -> getElapsedTime(status, now) < RETROSPECTIVE_THRESHOLD)
.forEach(this::addStatusEvent);
}
@Override
public void addStatusEvent(Status status) {
if (isPrintable(status, 0)) {
if (this.debug || status.getLevel() >= Status.WARN) {
super.addStatusEvent(status);
}
}
private boolean isPrintable(Status status, long now) {
boolean timstampInRange = (now == 0 || (now - status.getTimestamp()) < RETROSPECTIVE_THRESHOLD);
return timstampInRange && (this.debug || status.getLevel() >= Status.WARN);
}
@Override
protected PrintStream getPrintStream() {
return (!this.debug) ? System.err : System.out;
}
private static long getElapsedTime(Status status, long now) {
return now - status.getTimestamp();
}
static void addTo(LoggerContext loggerContext) {
addTo(loggerContext, false);
}
static void addTo(LoggerContext loggerContext, boolean debug) {
SystemStatusListener listener = new SystemStatusListener(debug);
listener.setContext(loggerContext);
StatusManager statusManager = loggerContext.getStatusManager();
if (statusManager.add(listener)) {
listener.start();
}
}
@Override
public boolean equals(Object obj) {
return (obj != null) && (obj.getClass() == getClass());
}
@Override
public int hashCode() {
return getClass().hashCode();
StatusListenerConfigHelper.addOnConsoleListenerInstance(loggerContext, new SystemStatusListener(debug));
}
}