extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-21 18:22:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

[signal] adjust log levels (#3813)

Browse Source
This commit is contained in:
Pascal Fischer 2025-05-12 19:48:47 +02:00 committed by GitHub
parent 2f34e984b0
commit 20f59ddecb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
signal/peer/peer.go
View File

@ -79,7 +79,7 @@ func (registry *Registry) Register(peer *Peer) {
p, loaded := registry.Peers.LoadOrStore(peer.Id, peer) p, loaded := registry.Peers.LoadOrStore(peer.Id, peer)
if loaded { if loaded {
pp := p.(*Peer) pp := p.(*Peer)
log.Warnf("peer [%s] is already registered [new streamID %d, previous StreamID %d]. Will override stream.", log.Debugf("peer [%s] is already registered [new streamID %d, previous StreamID %d]. Will override stream.",
peer.Id, peer.StreamID, pp.StreamID) peer.Id, peer.StreamID, pp.StreamID)
registry.Peers.Store(peer.Id, peer) registry.Peers.Store(peer.Id, peer)
return return
@ -104,7 +104,7 @@ func (registry *Registry) Deregister(peer *Peer) {
pp := p.(*Peer) pp := p.(*Peer)
if peer.StreamID < pp.StreamID { if peer.StreamID < pp.StreamID {
registry.Peers.Store(peer.Id, p) registry.Peers.Store(peer.Id, p)
log.Warnf("attempted to remove newer registered stream of a peer [%s] [newer streamID %d, previous StreamID %d]. Ignoring.", log.Debugf("attempted to remove newer registered stream of a peer [%s] [newer streamID %d, previous StreamID %d]. Ignoring.",
peer.Id, pp.StreamID, peer.StreamID) peer.Id, pp.StreamID, peer.StreamID)
return return
} }

9
signal/server/signal.go
View File

@ -6,7 +6,6 @@ import (
"io" "io"
"time" "time"
"github.com/netbirdio/signal-dispatcher/dispatcher"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric"
@ -15,6 +14,8 @@ import (
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
gproto "google.golang.org/protobuf/proto" gproto "google.golang.org/protobuf/proto"
"github.com/netbirdio/signal-dispatcher/dispatcher"
"github.com/netbirdio/netbird/signal/metrics" "github.com/netbirdio/netbird/signal/metrics"
"github.com/netbirdio/netbird/signal/peer" "github.com/netbirdio/netbird/signal/peer"
"github.com/netbirdio/netbird/signal/proto" "github.com/netbirdio/netbird/signal/proto"
@ -69,7 +70,7 @@ func NewServer(ctx context.Context, meter metric.Meter) (*Server, error) {
// Send forwards a message to the signal peer // Send forwards a message to the signal peer
func (s *Server) Send(ctx context.Context, msg *proto.EncryptedMessage) (*proto.EncryptedMessage, error) { func (s *Server) Send(ctx context.Context, msg *proto.EncryptedMessage) (*proto.EncryptedMessage, error) {
log.Debugf("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey) log.Tracef("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey)
if _, found := s.registry.Get(msg.RemoteKey); found { if _, found := s.registry.Get(msg.RemoteKey); found {
s.forwardMessageToPeer(ctx, msg) s.forwardMessageToPeer(ctx, msg)
@ -112,7 +113,7 @@ func (s *Server) ConnectStream(stream proto.SignalExchange_ConnectStreamServer)
return err return err
} }
log.Debugf("Received a response from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey) log.Tracef("Received a response from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey)
_, err = s.dispatcher.SendMessage(stream.Context(), msg) _, err = s.dispatcher.SendMessage(stream.Context(), msg)
if err != nil { if err != nil {
@ -149,7 +150,7 @@ func (s *Server) DeregisterPeer(p *peer.Peer) {
} }
func (s *Server) forwardMessageToPeer(ctx context.Context, msg *proto.EncryptedMessage) { func (s *Server) forwardMessageToPeer(ctx context.Context, msg *proto.EncryptedMessage) {
log.Debugf("forwarding a new message from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey) log.Tracef("forwarding a new message from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey)
getRegistrationStart := time.Now() getRegistrationStart := time.Now()
// lookup the target peer where the message is going to // lookup the target peer where the message is going to