Skip to content

Commit

Permalink
Don't grab addresses from public remotes
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <[email protected]>
  • Loading branch information
stgraber committed Nov 25, 2016
1 parent 99da53e commit 28a8da2
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,16 +330,24 @@ func NewClientFromInfo(info ConnectInfo) (*Client, error) {
func (c *Client) Addresses() ([]string, error) {
addresses := make([]string, 0)

serverStatus, err := c.ServerStatus()
if err != nil {
return nil, err
}

if c.Transport == "unix" {
serverStatus, err := c.ServerStatus()
if err != nil {
return nil, err
}

addresses = serverStatus.Environment.Addresses
} else if c.Transport == "https" {
addresses = append(addresses, c.BaseURL[8:])
addresses = append(addresses, serverStatus.Environment.Addresses...)

if !c.Remote.Public {
serverStatus, err := c.ServerStatus()
if err != nil {
return nil, err
}

addresses = append(addresses, serverStatus.Environment.Addresses...)
}
} else {
return nil, fmt.Errorf("unknown transport type: %s", c.Transport)
}
Expand Down

0 comments on commit 28a8da2

Please sign in to comment.