luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Use new discover and useragent libs

This commit is contained in:
Seth Vargo 2018-05-04 12:11:12 -07:00
parent 5911fd5344
commit 303b56e07b
No known key found for this signature in database
GPG Key ID: C921994F9C27E0FF
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/retry_join.go
View File

@ -6,6 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/hashicorp/consul/lib"
discover "github.com/hashicorp/go-discover" discover "github.com/hashicorp/go-discover"
) )
@ -67,7 +68,11 @@ func (r *retryJoiner) retryJoin() error {
return nil return nil
} }
disco := discover.Discover{} disco, err := discover.New(discover.WithUserAgent(lib.UserAgent()))
if err != nil {
return err
}
r.logger.Printf("[INFO] agent: Retry join %s is supported for: %s", r.cluster, strings.Join(disco.Names(), " ")) r.logger.Printf("[INFO] agent: Retry join %s is supported for: %s", r.cluster, strings.Join(disco.Names(), " "))
r.logger.Printf("[INFO] agent: Joining %s cluster...", r.cluster) r.logger.Printf("[INFO] agent: Joining %s cluster...", r.cluster)
attempt := 0 attempt := 0

5
agent/retry_join_test.go
View File

@ -8,7 +8,10 @@ import (
) )
func TestGoDiscoverRegistration(t *testing.T) { func TestGoDiscoverRegistration(t *testing.T) {
d := discover.Discover{} d, err := discover.New()
if err != nil {
t.Fatal(err)
}
got := d.Names() got := d.Names()
want := []string{"aliyun", "aws", "azure", "digitalocean", "gce", "os", "scaleway", "softlayer", "triton"} want := []string{"aliyun", "aws", "azure", "digitalocean", "gce", "os", "scaleway", "softlayer", "triton"}
if !reflect.DeepEqual(got, want) { if !reflect.DeepEqual(got, want) {