Skip to content

Commit f9316fb

Browse files
Merge pull request #66 from xenit-eu/suppress-exception-logging-for-logs
Reduce logspam of exception stacktraces for logs that can't be read
2 parents 2a08022 + 32025ad commit f9316fb

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

contentgrid-junit-jupiter-k8s/src/main/java/com/contentgrid/junit/jupiter/k8s/wait/resource/PodAwaitableResource.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private Stream<? extends LogLine> readContainer(PodResource resource, String con
5050
.getLogReader()
5151
);
5252
} catch(KubernetesClientException exception) {
53-
log.warn("Failed to read logs from {} container {}", this, containerName, exception);
53+
logReadException(containerName, exception);
5454
}
5555

5656
try {
@@ -62,11 +62,19 @@ private Stream<? extends LogLine> readContainer(PodResource resource, String con
6262
.getLogReader()
6363
);
6464
} catch(KubernetesClientException exception) {
65-
log.warn("Failed to read logs from {} container {}", this, containerName, exception);
65+
logReadException(containerName, exception);
6666
}
6767
return logReaders.stream().flatMap(logReader -> readLogs(containerName, logReader));
6868
}
6969

70+
private void logReadException(String containerName, KubernetesClientException exception) {
71+
if(log.isTraceEnabled()) {
72+
log.warn("Failed to read logs from {} container {}", this, containerName, exception);
73+
} else {
74+
log.warn("Failed to read logs from {} container {}: {}", this, containerName, exception.getStatus().getMessage());
75+
}
76+
}
77+
7078
private Stream<LogLine> readLogs(String containerName, Reader logReader) {
7179
return new BufferedReader(logReader).lines()
7280
.map(line -> createLogLine(line, containerName));

0 commit comments

Comments
 (0)