From af944853ac47174bce359b57dd9382abfaf3b69a Mon Sep 17 00:00:00 2001 From: Jesus Zuniga Date: Mon, 8 Jan 2024 12:01:23 -0800 Subject: [PATCH 1/2] return false if ignore pod dir is empty or null --- .../main/java/com/pinterest/singer/kubernetes/KubeService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java b/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java index d6cf2861..ec1dcef1 100644 --- a/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java +++ b/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java @@ -450,6 +450,7 @@ public static void reset() { } private boolean checkIgnoreDirectory(String podName) { + if (ignorePodDirectory == null || ignorePodDirectory.isEmpty()) return false; return Files.exists(Paths.get(podLogDirectory, podName, ignorePodDirectory)); } } From 01a374bde9f1c192f3e48895dd2210544f58bd0f Mon Sep 17 00:00:00 2001 From: Jesus Zuniga Date: Tue, 9 Jan 2024 13:57:03 -0800 Subject: [PATCH 2/2] bump version --- pom.xml | 2 +- singer-commons/pom.xml | 2 +- singer/pom.xml | 2 +- thrift-logger/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8e7149b1..655ab140 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.pinterest.singer singer-package - 0.8.0.78 + 0.8.0.79 pom Singer Logging Agent modules 2013 diff --git a/singer-commons/pom.xml b/singer-commons/pom.xml index eb0ac87c..65c3753d 100644 --- a/singer-commons/pom.xml +++ b/singer-commons/pom.xml @@ -19,7 +19,7 @@ com.pinterest.singer singer-package - 0.8.0.78 + 0.8.0.79 ../pom.xml diff --git a/singer/pom.xml b/singer/pom.xml index db78dc7b..3a5512c2 100644 --- a/singer/pom.xml +++ b/singer/pom.xml @@ -7,7 +7,7 @@ com.pinterest.singer singer-package - 0.8.0.78 + 0.8.0.79 ../pom.xml diff --git a/thrift-logger/pom.xml b/thrift-logger/pom.xml index e91dc543..738b32b7 100644 --- a/thrift-logger/pom.xml +++ b/thrift-logger/pom.xml @@ -4,7 +4,7 @@ com.pinterest.singer singer-package - 0.8.0.78 + 0.8.0.79 ../pom.xml thrift-logger