status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

golint: Consistent receiver name 

Ensure the receiver name is consistent
This commit is contained in:
Frank Schroeder 2017-04-20 11:51:27 -07:00 committed by Frank Schröder
parent 5f34d766b8
commit 6688a510e1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
command/agent/command.go
View File

@ -444,18 +444,18 @@ func (c *Command) readConfig() *Config {
// verifyUniqueListeners checks to see if an address was used more than once in // verifyUniqueListeners checks to see if an address was used more than once in
// the config // the config
func (config *Config) verifyUniqueListeners() error { func (c *Config) verifyUniqueListeners() error {
listeners := []struct { listeners := []struct {
host string host string
port int port int
descr string descr string
}{ }{
{config.Addresses.DNS, config.Ports.DNS, "DNS"}, {c.Addresses.DNS, c.Ports.DNS, "DNS"},
{config.Addresses.HTTP, config.Ports.HTTP, "HTTP"}, {c.Addresses.HTTP, c.Ports.HTTP, "HTTP"},
{config.Addresses.HTTPS, config.Ports.HTTPS, "HTTPS"}, {c.Addresses.HTTPS, c.Ports.HTTPS, "HTTPS"},
{config.AdvertiseAddr, config.Ports.Server, "Server RPC"}, {c.AdvertiseAddr, c.Ports.Server, "Server RPC"},
{config.AdvertiseAddr, config.Ports.SerfLan, "Serf LAN"}, {c.AdvertiseAddr, c.Ports.SerfLan, "Serf LAN"},
{config.AdvertiseAddr, config.Ports.SerfWan, "Serf WAN"}, {c.AdvertiseAddr, c.Ports.SerfWan, "Serf WAN"},
} }
type key struct { type key struct {

4
consul/server.go
View File

@ -803,8 +803,8 @@ func (s *Server) JoinWAN(addrs []string) (int, error) {
} }
// LocalMember is used to return the local node // LocalMember is used to return the local node
func (c *Server) LocalMember() serf.Member { func (s *Server) LocalMember() serf.Member {
return c.serfLAN.LocalMember() return s.serfLAN.LocalMember()
} }
// LANMembers is used to return the members of the LAN cluster // LANMembers is used to return the members of the LAN cluster