diff --git a/.gitignore b/.gitignore index 5f049bb8..137bf90a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ # These are backup files generated by rustfmt **/*.rs.bk + +/test/bin/ diff --git a/Makefile b/Makefile index 345cba6f..2f94e113 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ package-install: test/bin/kind: mkdir -p test/bin - curl -Lo test/bin/kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64 + curl -Lo test/bin/kind https://kind.sigs.k8s.io/dl/v0.19.0/kind-linux-amd64 chmod +x test/bin/kind create-kind: test/bin/kind diff --git a/src/event/kubernetes/log.rs b/src/event/kubernetes/log.rs index 127dcb03..05bbcac8 100644 --- a/src/event/kubernetes/log.rs +++ b/src/event/kubernetes/log.rs @@ -828,17 +828,30 @@ impl Worker for FetchLogStream { let mut logs = self.pod_api.log_stream(&self.pod_name, &lp).await?.boxed(); - while let Some(line) = logs.try_next().await? { + while let Some(bytes) = logs.try_next().await? { let mut buf = self.buf.write().await; - buf.push(format!("{}{}", prefix, String::from_utf8_lossy(&line))); + + let logs = String::from_utf8_lossy(&bytes); logger!( debug, "Container log stream [{}:{}] - {}", self.pod_name, self.container_name, - String::from_utf8_lossy(&line) + logs ); + + for line in logs.lines() { + buf.push(format!("{}{}", prefix, line)); + + logger!( + debug, + "Container log stream [{}:{}] - {}", + self.pod_name, + self.container_name, + line + ); + } } logger!( diff --git a/test/bin/kind b/test/bin/kind deleted file mode 100755 index 56a7d54f..00000000 Binary files a/test/bin/kind and /dev/null differ