Merge branch 'master' into new-report

weaveworks · Jun 3, 2015 · 71523fb · 71523fb
2 parents 8d88107 + bba5222
commit 71523fb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/probe/main.go b/probe/main.go
@@ -66,14 +66,16 @@ func main() {
 
 	taggers := []tag.Tagger{tag.NewTopologyTagger()}
 	if *dockerTagger {
-		taggers = append(taggers, tag.NewDockerTagger(*procRoot, *dockerInterval))
+		t := tag.NewDockerTagger(*procRoot, *dockerInterval)
+		defer t.Stop()
+		taggers = append(taggers, t)
 	}
 
 	log.Printf("listening on %s", *listen)
 
 	quit := make(chan struct{})
 	defer close(quit)
-
+	
 	go func() {
 		var (
 			hostname = hostname()