Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private Stream<? extends LogLine> readContainer(PodResource resource, String con
.getLogReader()
);
} catch(KubernetesClientException exception) {
log.warn("Failed to read logs from {} container {}", this, containerName, exception);
logReadException(containerName, exception);
}

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

private void logReadException(String containerName, KubernetesClientException exception) {
if(log.isTraceEnabled()) {
log.warn("Failed to read logs from {} container {}", this, containerName, exception);
} else {
log.warn("Failed to read logs from {} container {}: {}", this, containerName, exception.getStatus().getMessage());
}
}

private Stream<LogLine> readLogs(String containerName, Reader logReader) {
return new BufferedReader(logReader).lines()
.map(line -> createLogLine(line, containerName));
Expand Down