Fix waitgroup deadlock if url is incorrect in apache input (#4176)

influxdata · May 21, 2018 · 95c5ba6 · 95c5ba6
1 parent 3f89f35
commit 95c5ba6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go
@@ -57,6 +57,8 @@ func (n *Apache) Description() string {
 }
 
 func (n *Apache) Gather(acc telegraf.Accumulator) error {
+	var wg sync.WaitGroup
+
 	if len(n.Urls) == 0 {
 		n.Urls = []string{"http://localhost/server-status?auto"}
 	}
@@ -72,15 +74,14 @@ func (n *Apache) Gather(acc telegraf.Accumulator) error {
 		n.client = client
 	}
 
-	var wg sync.WaitGroup
-	wg.Add(len(n.Urls))
 	for _, u := range n.Urls {
 		addr, err := url.Parse(u)
 		if err != nil {
 			acc.AddError(fmt.Errorf("Unable to parse address '%s': %s", u, err))
 			continue
 		}
 
+		wg.Add(1)
 		go func(addr *url.URL) {
 			defer wg.Done()
 			acc.AddError(n.gatherUrl(addr, acc))