Procházet zdrojové kódy

remove debugging logs

Matthew R Kasun před 2 roky
rodič
revize
464e6eb778
3 změnil soubory, kde provedl 0 přidání a 16 odebrání
  1. 0 3
      logic/peers.go
  2. 0 6
      logic/relay.go
  3. 0 7
      mq/relay.go

+ 0 - 3
logic/peers.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 	"net/netip"
 
@@ -787,13 +786,11 @@ func GetPeerUpdate(host *models.Host) []wgtypes.PeerConfig {
 			}
 			//normal peer
 			if nodeacls.AreNodesAllowed(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID.String()), nodeacls.NodeID(peer.Node.ID.String())) {
-				log.Println("node allowed", client.Host.Name, peer.Host.Name)
 				update.AllowedIPs = append(update.AllowedIPs, AddAllowedIPs(&peer)...)
 				peerUpdate = append(peerUpdate, update)
 			} else {
 				update.Remove = true
 				peerUpdate = append(peerUpdate, update)
-				log.Println("node not allowed", client.Host.Name, peer.Host.Name)
 			}
 		}
 	}

+ 0 - 6
logic/relay.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
 	"net"
 
 	"github.com/gravitl/netmaker/database"
@@ -229,10 +228,8 @@ func peerUpdateForRelayedByRelay(relayed, relay *models.Client) wgtypes.PeerConf
 			continue
 		}
 		if nodeacls.AreNodesAllowed(nodeacls.NetworkID(relayed.Node.Network), nodeacls.NodeID(relayed.Node.ID.String()), nodeacls.NodeID(peer.Node.ID.String())) {
-			log.Println("node allowed", relayed.Host.Name, peer.Host.Name)
 			update.AllowedIPs = append(update.AllowedIPs, AddAllowedIPs(&peer)...)
 		} else {
-			log.Println("node not allowed", relayed.Host.Name, peer.Host.Name)
 		}
 	}
 	return update
@@ -260,11 +257,8 @@ func peerUpdateForRelay(relay *models.Client, peers []models.Client) []wgtypes.P
 			PersistentKeepaliveInterval: &peer.Node.PersistentKeepalive,
 		}
 		if nodeacls.AreNodesAllowed(nodeacls.NetworkID(relay.Node.Network), nodeacls.NodeID(relay.Node.ID.String()), nodeacls.NodeID(peer.Node.ID.String())) {
-			log.Println("node allowed", relay.Host.Name, peer.Host.Name)
 			update.AllowedIPs = append(update.AllowedIPs, AddAllowedIPs(&peer)...)
 			peerConfig = append(peerConfig, update)
-		} else {
-			log.Println("node not allowed", relay.Host.Name, peer.Host.Name)
 		}
 	}
 	return peerConfig

+ 0 - 7
mq/relay.go

@@ -3,7 +3,6 @@ package mq
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 	"net"
 
 	"github.com/gravitl/netmaker/logger"
@@ -44,11 +43,9 @@ func PubPeerUpdate(client, relay *models.Client, peers []models.Client) {
 			PersistentKeepaliveInterval: &peer.Node.PersistentKeepalive,
 		}
 		if nodeacls.AreNodesAllowed(nodeacls.NetworkID(client.Node.Network), nodeacls.NodeID(client.Node.ID.String()), nodeacls.NodeID(peer.Node.ID.String())) {
-			log.Println("node allowed", client.Host.Name, peer.Host.Name)
 			update.AllowedIPs = append(update.AllowedIPs, logic.AddAllowedIPs(&peer)...)
 		} else {
 			update.Remove = true
-			log.Println("node not allowed", client.Host.Name, client.Node.Address, peer.Host.Name, peer.Node.Address)
 		}
 		if relay != nil {
 			if peer.Node.IsRelayed && peer.Node.RelayedBy == relay.Node.ID.String() {
@@ -78,7 +75,6 @@ func getRelayAllowedIPs(client, peer models.Client) []net.IPNet {
 			continue
 		}
 		if !nodeacls.AreNodesAllowed(nodeacls.NetworkID(client.Node.Network), nodeacls.NodeID(client.Node.ID.String()), nodeacls.NodeID(node.ID.String())) {
-			log.Println("node not allowed", client.Host.Name, node.Address.IP)
 			continue
 		}
 		if node.Address.IP != nil {
@@ -205,10 +201,7 @@ func pubRelayedUpdate(client, relay *models.Client, peers []models.Client) {
 			continue
 		}
 		if nodeacls.AreNodesAllowed(nodeacls.NetworkID(client.Node.Network), nodeacls.NodeID(client.Node.ID.String()), nodeacls.NodeID(peer.Node.ID.String())) {
-			log.Println("node allowed", client.Host.Name, peer.Host.Name)
 			update.AllowedIPs = append(update.AllowedIPs, logic.AddAllowedIPs(&peer)...)
-		} else {
-			log.Println("node not allowed", client.Host.Name, peer.Host.Name)
 		}
 	}
 	p.Peers = append(p.Peers, update)