homelab/traefik
1
0
Fork 0
Code Activity

[Marathon] Bump go-marathon dep

Browse source 
attempt to remove glide from integration

glide trim

Revert "attempt to remove glide from integration"

This reverts commit c5b42b6cdebb44e730080a0cf20a871c11ef095b.
This commit is contained in:
jangie 2017-05-02 02:17:27 +00:00 • committed by Timo Reimann
parent bd6056c269
commit 4e238280bc
376 changed files with 32648 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

23
vendor/github.com/gambol99/go-marathon/cluster.go generated vendored
View file

@ -18,7 +18,6 @@ package marathon
import (
"fmt"
"net/http"
"net/url"
"strings"
"sync"
@ -38,8 +37,8 @@ type cluster struct {
sync.RWMutex
// a collection of nodes
members []*member
// the http client
client *http.Client
// the marathon HTTP client to ensure consistency in requests
client *httpClient
}
// member represents an individual endpoint
@ -51,7 +50,7 @@ type member struct {
}
// newCluster returns a new marathon cluster
func newCluster(client *http.Client, marathonURL string) (*cluster, error) {
func newCluster(client *httpClient, marathonURL string, isDCOS bool) (*cluster, error) {
// step: extract and basic validate the endpoints
var members []*member
var defaultProto string
@ -83,6 +82,13 @@ func newCluster(client *http.Client, marathonURL string) (*cluster, error) {
return nil, newInvalidEndpointError("endpoint: %s must have a host", endpoint)
}
// step: if DCOS is set and no path is given, set the default DCOS path.
// done in order to maintain compatibility with automatic addition of the
// default DCOS path.
if isDCOS && strings.TrimLeft(u.Path, "/") == "" {
u.Path = defaultDCOSPath
}
// step: create a new node for this endpoint
members = append(members, &member{endpoint: u.String()})
}
@ -125,9 +131,12 @@ func (c *cluster) markDown(endpoint string) {
func (c *cluster) healthCheckNode(node *member) {
// step: wait for the node to become active ... we are assuming a /ping is enough here
for {
res, err := c.client.Get(fmt.Sprintf("%s/ping", node.endpoint))
if err == nil && res.StatusCode == 200 {
break
req, err := c.client.buildMarathonRequest("GET", node.endpoint, "/ping", nil)
if err == nil {
res, err := c.client.Do(req)
if err == nil && res.StatusCode == 200 {
break
}
}
<-time.After(time.Duration(5 * time.Second))
}