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

Fix notifiable when creating sync tree

Browse Source
This commit is contained in:
mcrakhman 2022-12-05 17:21:14 +01:00
parent cd197dc7d7
commit acf5b95646
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/commonspace/space.go
View File

@ -108,7 +108,7 @@ func (s *space) LastUsage() time.Time {
} }
func (s *space) Locked() bool { func (s *space) Locked() bool {
log.With(zap.Bool("locked", s.treesUsed.Load() > 1)).Debug("space lock status check") log.With(zap.Int32("trees used", s.treesUsed.Load())).Debug("space lock status check")
return s.treesUsed.Load() > 1 return s.treesUsed.Load() > 1
} }

6
common/commonspace/synctree/synctree.go
View File

@ -100,6 +100,9 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (t SyncTree, err error
syncTree.listener.Rebuild(syncTree) syncTree.listener.Rebuild(syncTree)
} }
syncTree.treeUsage.Add(1) syncTree.treeUsage.Add(1)
if syncTree.notifiable != nil {
syncTree.notifiable.UpdateHeads(objTree.ID(), objTree.Heads())
}
headUpdate := syncClient.CreateHeadUpdate(t, nil) headUpdate := syncClient.CreateHeadUpdate(t, nil)
err = syncClient.BroadcastAsync(headUpdate) err = syncClient.BroadcastAsync(headUpdate)
@ -133,6 +136,9 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (t SyncTree, err error
syncTree.listener.Rebuild(syncTree) syncTree.listener.Rebuild(syncTree)
} }
syncTree.treeUsage.Add(1) syncTree.treeUsage.Add(1)
if syncTree.notifiable != nil {
syncTree.notifiable.UpdateHeads(objTree.ID(), objTree.Heads())
}
headUpdate := syncClient.CreateHeadUpdate(t, nil) headUpdate := syncClient.CreateHeadUpdate(t, nil)
err = syncClient.BroadcastAsync(headUpdate) err = syncClient.BroadcastAsync(headUpdate)