Browse Source

Merge pull request #1976 from gravitl/bugfix_v0.18_0_address_of_loop_vars

correct use: address of loop vars
dcarns 2 years ago
parent
commit
a4e5f84be8
3 changed files with 5 additions and 0 deletions
  1. 1 0
      ee/logic/failover.go
  2. 2 0
      logic/peers.go
  3. 2 0
      mq/publishers.go

+ 1 - 0
ee/logic/failover.go

@@ -23,6 +23,7 @@ func ResetFailover(network string) error {
 		return err
 	}
 	for _, node := range nodes {
+		node := node
 		err = SetFailover(&node)
 		if err != nil {
 			logger.Log(2, "error setting failover for node", node.ID.String(), ":", err.Error())

+ 2 - 0
logic/peers.go

@@ -72,6 +72,7 @@ func GetPeersForProxy(node *models.Node, onlyPeers bool) (proxy_models.ProxyMana
 			} else {
 				relayPeersMap := make(map[string]proxy_models.RelayedConf)
 				for _, relayedNode := range relayedNodes {
+					relayedNode := relayedNode
 					payload, err := GetPeersForProxy(&relayedNode, true)
 					if err == nil {
 						relayedHost, err := GetHost(relayedNode.HostID.String())
@@ -215,6 +216,7 @@ func GetProxyUpdateForHost(host *models.Host) (proxy_models.ProxyManagerPayload,
 		relayedHosts := GetRelayedHosts(host)
 		relayPeersMap := make(map[string]proxy_models.RelayedConf)
 		for _, relayedHost := range relayedHosts {
+			relayedHost := relayedHost
 			payload, err := GetPeerUpdateForHost(&relayedHost)
 			if err == nil {
 				relayedEndpoint, udpErr := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", relayedHost.EndpointIP, getPeerListenPort(&relayedHost)))

+ 2 - 0
mq/publishers.go

@@ -25,6 +25,7 @@ func PublishPeerUpdate() error {
 		return err
 	}
 	for _, host := range hosts {
+		host := host
 		err = PublishSingleHostUpdate(&host)
 		if err != nil {
 			logger.Log(1, "failed to publish peer update to host", host.ID.String(), ": ", err.Error())
@@ -135,6 +136,7 @@ func sendPeers() {
 
 	for _, host := range hosts {
 		if force {
+			host := host
 			logger.Log(2, "sending scheduled peer update (5 min)")
 			err = PublishSingleHostUpdate(&host)
 			if err != nil {