sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-16 03:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

use current context when logging sync message version

Browse Source 
Signed-off-by: Dmitri Dolguikh <dmitri.external@netbird.io>
This commit is contained in:
Dmitri Dolguikh
2026-07-15 17:01:20 +02:00
parent 14aad75e86
commit cfb534af8f
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
management/internals/controllers/network_map/controller/controller.go
View File

@@ -236,11 +236,7 @@ func (c *Controller) sendUpdateAccountPeers(ctx context.Context, accountID strin
c.perAccountOrGlobalSupportedSyncMessageVersions(accountID),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithFields(
log.Fields{
"sync_message_version": commonSyncMessageVersions[0],
"peer_id": peer.ID,
}).Debug("common highest sync message version")
log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(
@@ -407,11 +403,7 @@ func (c *Controller) sendUpdateForAffectedPeers(ctx context.Context, accountID s
c.perAccountOrGlobalSupportedSyncMessageVersions(accountID),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithFields(
log.Fields{
"sync_message_version": commonSyncMessageVersions[0],
"peer_id": peer.ID,
}).Debug("common highest sync message version")
log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(
@@ -547,11 +539,7 @@ func (c *Controller) UpdateAccountPeer(ctx context.Context, accountId string, pe
c.perAccountOrGlobalSupportedSyncMessageVersions(accountId),
grpc.SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithFields(
log.Fields{
"sync_message_version": commonSyncMessageVersions[0],
"peer_id": peer.ID,
}).Debug("common highest sync message version")
log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == grpc.ComponentNetworkMap {
components := account.GetPeerNetworkMapComponents(

6
management/internals/shared/grpc/server.go
View File

@@ -1025,11 +1025,7 @@ func (s *Server) sendInitialSync(ctx context.Context, peerKey wgtypes.Key, peer
SyncMessageVersionsFromString(s.perAccountOrGlobalSyncMessageVersions(peer.AccountID)),
SyncMessageVersionsFromProtoEnums(peer.Meta.Capabilities))
log.WithFields(
log.Fields{
"sync_message_version": commonSyncMessageVersions[0],
"peer_id": peer.ID,
}).Debug("common highest sync message version")
log.WithContext(ctx).WithField("sync_message_version", commonSyncMessageVersions[0]).Debug("common highest sync message version")
if commonSyncMessageVersions[0] == ComponentNetworkMap {
// Capable peer: discard the legacy NetworkMap that SyncAndMarkPeer