From 8dc44012f055794074afa3432be82a58f3ae915c Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 12 Jun 2015 12:56:59 +0200 Subject: [PATCH] probe: don't spam logs on Darwin --- probe/main.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/probe/main.go b/probe/main.go index 87221ea2a..c5c505f36 100644 --- a/probe/main.go +++ b/probe/main.go @@ -21,6 +21,8 @@ import ( var version = "dev" // set at build time +const linux = "linux" // runtime.GOOS + func main() { var ( httpListen = flag.String("http.listen", "", "listen address for HTTP profiling and instrumentation server") @@ -66,7 +68,7 @@ func main() { taggers := []tag.Tagger{tag.NewTopologyTagger()} var dockerTagger *tag.DockerTagger - if *dockerEnabled && runtime.GOOS == "linux" { + if *dockerEnabled && runtime.GOOS == linux { var err error dockerTagger, err = tag.NewDockerTagger(*procRoot, *dockerInterval) if err != nil { @@ -100,10 +102,14 @@ func main() { case <-spyTick: r.Merge(spy(hostID, hostName, *spyProcs)) - if pidTree, err := tag.NewPIDTree(*procRoot); err == nil { - r.Process.Merge(pidTree.ProcessTopology(hostID)) - } else { - log.Print(err) + // TODO abstract PIDTree to a process provider, and provide an + // alternate implementation for Darwin. + if runtime.GOOS == linux { + if pidTree, err := tag.NewPIDTree(*procRoot); err == nil { + r.Process.Merge(pidTree.ProcessTopology(hostID)) + } else { + log.Printf("PIDTree: %v", err) + } } if dockerTagger != nil {