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

Merge pull request #4714 from jglick/deadlock-JENKINS-62181

Browse Source 
[JENKINS-62181] Deadlock during log formatting
This commit is contained in:
Mark Waite authored and GitHub committed 2020-05-19 16:36:47 -06:00
2 parents 598d78b8b5 a01810e7d5
commit c2bd4fa006
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/slaves/SlaveComputer.java
+3 -3
View File
@@ -1020,12 +1020,12 @@ public class SlaveComputer extends Computer {
public Void call() {
SLAVE_LOG_HANDLER = new RingBufferLogHandler(ringBufferSize) {
Formatter dummy = new SimpleFormatter();
ThreadLocal<Formatter> dummy = ThreadLocal.withInitial(() -> new SimpleFormatter());
@Override
public synchronized void publish(LogRecord record) {
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.formatMessage(record));
record.setMessage(dummy.get().formatMessage(record));
record.setParameters(null);
}
super.publish(record);