From 76076bfb47710fd1fcd43e74bf8fed84d3b0e133 Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Sat, 30 Apr 2016 21:04:19 +0200 Subject: [PATCH] discovery: simplify client initialization --- retrieval/discovery/marathon.go | 1 - retrieval/discovery/marathon/marathon_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/retrieval/discovery/marathon.go b/retrieval/discovery/marathon.go index e6f8edcf7..e22cf48f0 100644 --- a/retrieval/discovery/marathon.go +++ b/retrieval/discovery/marathon.go @@ -25,7 +25,6 @@ func NewMarathon(conf *config.MarathonSDConfig) *marathon.Discovery { return &marathon.Discovery{ Servers: conf.Servers, RefreshInterval: time.Duration(conf.RefreshInterval), - Done: make(chan struct{}), Client: marathon.FetchApps, } } diff --git a/retrieval/discovery/marathon/marathon_test.go b/retrieval/discovery/marathon/marathon_test.go index c01c876c2..79cb53466 100644 --- a/retrieval/discovery/marathon/marathon_test.go +++ b/retrieval/discovery/marathon/marathon_test.go @@ -30,8 +30,8 @@ func newTestDiscovery(client AppListClient) (chan []*config.TargetGroup, *Discov ch := make(chan []*config.TargetGroup) md := &Discovery{ Servers: []string{"http://localhost:8080"}, + Client: client, } - md.Client = client return ch, md }