benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix logs in diffsyncer (thanks Roma)

Browse Source
This commit is contained in:
mcrakhman 2023-05-11 18:48:38 +02:00
parent e186761968
commit 864e86ceb6
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commonspace/headsync/diffsyncer.go
View File

@ -154,24 +154,21 @@ func (d *diffSyncer) syncWithPeer(ctx context.Context, p peer.Peer) (err error)
func (d *diffSyncer) syncTrees(ctx context.Context, peerId string, trees []string) { func (d *diffSyncer) syncTrees(ctx context.Context, peerId string, trees []string) {
for _, tId := range trees { for _, tId := range trees {
log := d.log.With(zap.String("treeId", tId))
tree, err := d.cache.GetTree(ctx, d.spaceId, tId) tree, err := d.cache.GetTree(ctx, d.spaceId, tId)
if err != nil { if err != nil {
d.log.InfoCtx(ctx, "can't load tree", zap.Error(err)) log.WarnCtx(ctx, "can't load tree", zap.Error(err))
continue continue
} }
syncTree, ok := tree.(synctree.SyncTree) syncTree, ok := tree.(synctree.SyncTree)
if !ok { if !ok {
d.log.InfoCtx(ctx, "not a sync tree", zap.String("objectId", tId)) log.WarnCtx(ctx, "not a sync tree")
continue continue
} }
// the idea why we call it directly is that if we try to get it from cache
// it may be already there (i.e. loaded)
// and build func will not be called, thus we won't sync the tree
// therefore we just do it manually
if err = syncTree.SyncWithPeer(ctx, peerId); err != nil { if err = syncTree.SyncWithPeer(ctx, peerId); err != nil {
d.log.WarnCtx(ctx, "synctree.SyncWithPeer error", zap.Error(err), zap.String("treeId", tId)) log.WarnCtx(ctx, "synctree.SyncWithPeer error", zap.Error(err))
} else { } else {
d.log.DebugCtx(ctx, "success synctree.SyncWithPeer", zap.String("treeId", tId)) log.DebugCtx(ctx, "success synctree.SyncWithPeer")
} }
} }
} }