sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-27 12:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

add logging

Browse Source
This commit is contained in:
Pascal Fischer
2025-10-09 10:14:44 +02:00
parent c813b6ef50
commit 6ce67f383e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
signal/server/signal.go
View File

@@ -147,8 +147,10 @@ func (s *Server) SendWithDeliveryCheck(ctx context.Context, msg *proto.Encrypted
if _, found := s.registry.Get(msg.RemoteKey); found && !s.directSendDisabled { if _, found := s.registry.Get(msg.RemoteKey); found && !s.directSendDisabled {
if err := s.forwardMessageToPeer(ctx, msg); err != nil { if err := s.forwardMessageToPeer(ctx, msg); err != nil {
if errors.Is(err, ErrPeerNotConnected) { if errors.Is(err, ErrPeerNotConnected) {
log.Tracef("remote peer [%s] not connected", msg.RemoteKey)
return nil, status.Errorf(codes.NotFound, "remote peer not connected") return nil, status.Errorf(codes.NotFound, "remote peer not connected")
} }
log.Errorf("error sending message with delivery check to peer [%s]: %v", msg.RemoteKey, err)
return nil, status.Errorf(codes.Internal, "error forwarding message to peer: %v", err) return nil, status.Errorf(codes.Internal, "error forwarding message to peer: %v", err)
} }
return &emptypb.Empty{}, nil return &emptypb.Empty{}, nil
@@ -156,6 +158,7 @@ func (s *Server) SendWithDeliveryCheck(ctx context.Context, msg *proto.Encrypted
if _, err := s.dispatcher.SendMessage(ctx, msg, true); err != nil { if _, err := s.dispatcher.SendMessage(ctx, msg, true); err != nil {
if errors.Is(err, dispatcher.ErrPeerNotConnected) { if errors.Is(err, dispatcher.ErrPeerNotConnected) {
log.Tracef("remote peer [%s] doesn't have a listener", msg.RemoteKey)
return nil, status.Errorf(codes.NotFound, "remote peer not connected") return nil, status.Errorf(codes.NotFound, "remote peer not connected")
} }
return nil, err return nil, err
@@ -169,6 +172,7 @@ func (s *Server) ConnectStream(stream proto.SignalExchange_ConnectStreamServer)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
p, err := s.RegisterPeer(stream, cancel) p, err := s.RegisterPeer(stream, cancel)
if err != nil { if err != nil {
log.Errorf("error registering peer: %v", err)
return err return err
} }
@@ -178,6 +182,7 @@ func (s *Server) ConnectStream(stream proto.SignalExchange_ConnectStreamServer)
err = stream.SendHeader(s.successHeader) err = stream.SendHeader(s.successHeader)
if err != nil { if err != nil {
s.metrics.RegistrationFailures.Add(stream.Context(), 1, metric.WithAttributes(attribute.String(labelError, labelErrorFailedHeader))) s.metrics.RegistrationFailures.Add(stream.Context(), 1, metric.WithAttributes(attribute.String(labelError, labelErrorFailedHeader)))
log.Errorf("error sending registration header to peer [%s] [streamID %d] : %v", p.Id, p.StreamID, err)
return err return err
} }
@@ -202,7 +207,7 @@ func (s *Server) RegisterPeer(stream proto.SignalExchange_ConnectStreamServer, c
p := peer.NewPeer(id[0], stream, cancel) p := peer.NewPeer(id[0], stream, cancel)
if err := s.registry.Register(p); err != nil { if err := s.registry.Register(p); err != nil {
return nil, err return nil, fmt.Errorf("error adding peer to registry peer: %w", err)
} }
err := s.dispatcher.ListenForMessages(stream.Context(), p.Id, s.forwardMessageToPeer) err := s.dispatcher.ListenForMessages(stream.Context(), p.Id, s.forwardMessageToPeer)
if err != nil { if err != nil {