OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-10 02:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[JENKINS-63082] SLAVE_LOG_HANDLER should avoid synch logging (#4886)

Browse Source
This commit is contained in:
Jesse Glick authored and GitHub committed 2020-08-11 21:17:23 +01:00
1 parent 344033656d
commit 147e2efce7
1 file changed
+14 -7
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/slaves/SlaveComputer.java
+14 -7
View File
@@ -102,6 +102,10 @@ import java.util.logging.SimpleFormatter;
import java.util.stream.Stream;
import static hudson.slaves.SlaveComputer.LogHolder.SLAVE_LOG_HANDLER;
import hudson.util.DaemonThreadFactory;
import hudson.util.NamingThreadFactory;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.jenkinsci.remoting.util.LoggingChannelListener;
@@ -1025,15 +1029,18 @@ public class SlaveComputer extends Computer {
public Void call() {
SLAVE_LOG_HANDLER = new RingBufferLogHandler(ringBufferSize) {
ThreadLocal<Formatter> dummy = ThreadLocal.withInitial(() -> new SimpleFormatter());
Formatter dummy = new SimpleFormatter(); // only ever accessed from one thread anyway
ExecutorService executor = new ScheduledThreadPoolExecutor(1, new NamingThreadFactory(new DaemonThreadFactory(), "SLAVE_LOG_HANDLER"));
@Override
public /* not synchronized */ void publish(LogRecord record) {
// see LogRecord.writeObject for dangers of serializing non-String/null parameters
if (record.getMessage() != null && record.getParameters() != null && Stream.of(record.getParameters()).anyMatch(p -> p != null && !(p instanceof String))) {
record.setMessage(dummy.get().formatMessage(record));
record.setParameters(null);
}
public synchronized void publish(LogRecord record) {
super.publish(record);
executor.submit(() -> { // JENKINS-63082: unsafe to call methods of LogRecord here
// see LogRecord.writeObject for dangers of serializing non-String/null parameters
if (record.getMessage() != null && record.getParameters() != null && Stream.of(record.getParameters()).anyMatch(p -> p != null && !(p instanceof String))) {
record.setMessage(dummy.formatMessage(record));
record.setParameters(null);
}
});
}
};