fix-or-logic-in-docker-center (#25)

alibaba · Dec 1, 2021 · 876ea78 · 876ea78
1 parent 4856899
commit 876ea78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/helper/docker_center.go b/helper/docker_center.go
@@ -252,7 +252,7 @@ func (did *DockerInfoDetail) IsTimeout() bool {
 }
 
 func (did *DockerInfoDetail) GetExternalTags(envs, k8sLabels map[string]string) map[string]string {
-	if len(envs) == 0 || len(k8sLabels) == 0 {
+	if len(envs) == 0 && len(k8sLabels) == 0 {
 		return did.ContainerNameTag
 	}
 	tags := make(map[string]string)

diff --git a/plugins/input/docker/rawstdout/input_docker_stdout.go b/plugins/input/docker/rawstdout/input_docker_stdout.go
@@ -407,7 +407,7 @@ func (sds *ServiceDockerStdout) FlushAll(c ilogtail.Collector, firstStart bool)
 				stdout:               sds.Stdout,
 				stderr:               sds.Stderr,
 				ExternalEnvTag:       sds.ExternalEnvTag,
-				ExternalK8sLabelTag:  sds.ExcludeK8sLabel,
+				ExternalK8sLabelTag:  sds.ExternalK8sLabelTag,
 			}
 			sds.synerMap[id] = syner
 			go syner.Start(c)