Explorar o código

remove debugging logs

Matthew R Kasun %!s(int64=2) %!d(string=hai) anos
pai
achega
bf373f2396
Modificáronse 3 ficheiros con 0 adicións e 13 borrados
  1. 0 4
      logic/relay.go
  2. 0 7
      mq/relay.go
  3. 0 2
      mq/util.go

+ 0 - 4
logic/relay.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 
 	"github.com/gravitl/netmaker/database"
@@ -57,7 +56,6 @@ func CreateRelay(relay models.RelayRequest) ([]models.Client, models.Node, error
 
 // SetRelayedNodes- sets and saves node as relayed
 func SetRelayedNodes(setRelayed bool, relay string, relayed []string) []models.Client {
-	log.Println("setting relayed nodes", setRelayed, relay, relayed)
 	var returnnodes []models.Client
 	for _, id := range relayed {
 		node, err := GetNodeByID(id)
@@ -72,7 +70,6 @@ func SetRelayedNodes(setRelayed bool, relay string, relayed []string) []models.C
 			node.RelayedBy = ""
 		}
 		node.SetLastModified()
-		log.Println("setting relayed nodes", node.ID.String(), node.IsRelayed, node.RelayedBy)
 		data, err := json.Marshal(&node)
 		if err != nil {
 			logger.Log(0, "setRelayedNodes.Marshal", err.Error())
@@ -142,6 +139,5 @@ func getRelayedAddresses(id string) []net.IPNet {
 	if node.Address6.IP != nil {
 		addrs = append(addrs, node.Address6)
 	}
-	log.Println("====================== relayed addresses", addrs)
 	return addrs
 }

+ 0 - 7
mq/relay.go

@@ -3,7 +3,6 @@ package mq
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 	"net"
 
 	"github.com/gravitl/netmaker/logger"
@@ -166,7 +165,6 @@ func getIngressIPs(peer models.Client) []net.IPNet {
 
 // pubRelayedUpdate - publish peer update to a node (client) that is relayed by the relay
 func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
-	log.Println("pubRelayedUpdate", client.Host.Name, relay.Host.Name, len(*peers))
 	//verify
 	if !logic.StringSliceContains(relay.Node.RelayedNodes, client.Node.ID.String()) {
 		logger.Log(0, "invalid call to pubRelayed update", client.Host.Name, relay.Host.Name)
@@ -176,10 +174,8 @@ func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
 	p := models.PeerAction{
 		Action: models.RemovePeer,
 	}
-	log.Println("removing peers ")
 	for _, peer := range *peers {
 		if peer.Host.ID == relay.Host.ID || peer.Host.ID == client.Host.ID {
-			log.Println("skipping removal of ", peer.Host.Name)
 			continue
 		}
 		update := wgtypes.PeerConfig{
@@ -218,13 +214,10 @@ func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
 	}
 	p.Peers = append(p.Peers, update)
 	// add all other peers to allowed ips
-	log.Println("adding peers to allowed ips")
 	for _, peer := range *peers {
 		if peer.Host.ID == relay.Host.ID || peer.Host.ID == client.Host.ID {
-			log.Println("skipping ", peer.Host.Name, "in allowedips")
 			continue
 		}
-		log.Println("adding ", peer.Host.Name, peer.Node.Address, "to allowedips")
 		if peer.Node.Address.IP != nil {
 			peer.Node.Address.Mask = net.CIDRMask(32, 32)
 			update.AllowedIPs = append(update.AllowedIPs, peer.Node.Address)

+ 0 - 2
mq/util.go

@@ -3,7 +3,6 @@ package mq
 import (
 	"errors"
 	"fmt"
-	"log"
 	"strings"
 	"time"
 
@@ -78,7 +77,6 @@ func publish(host *models.Host, dest string, msg []byte) error {
 	if encryptErr != nil {
 		return encryptErr
 	}
-	log.Println("publishing to ", dest, " with message lenght", len(encrypted))
 	if mqclient == nil {
 		return errors.New("cannot publish ... mqclient not connected")
 	}