mirror of
https://github.com/anyproto/any-sync.git
synced 2025-06-09 17:45:03 +09:00
Add logs and fix building settings state
This commit is contained in:
parent
b2f8f83518
commit
51736bc535
4 changed files with 10 additions and 3 deletions
|
@ -4,6 +4,7 @@ import (
|
|||
"github.com/anytypeio/any-sync/commonspace/object/treegetter"
|
||||
"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
|
||||
"github.com/anytypeio/any-sync/util/slice"
|
||||
"go.uber.org/zap"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
@ -56,6 +57,7 @@ func (d *deletionManager) UpdateState(state *settingsstate.State) (err error) {
|
|||
}
|
||||
|
||||
if state.DeleterId != "" {
|
||||
log.Debug("deleting space", zap.String("spaceId", d.spaceId))
|
||||
spaceDeleter, ok := d.treeGetter.(SpaceDeleter)
|
||||
if ok {
|
||||
spaceDeleter.DeleteSpace(d.spaceId)
|
||||
|
|
|
@ -140,6 +140,7 @@ func (s *settingsObject) updateIds(tr objecttree.ObjectTree, isUpdate bool) {
|
|||
log.Error("failed to build state", zap.Error(err))
|
||||
return
|
||||
}
|
||||
log.Debug("updating object state", zap.String("deleterId", s.state.DeleterId))
|
||||
if err = s.deletionManager.UpdateState(s.state); err != nil {
|
||||
log.Error("failed to update state", zap.Error(err))
|
||||
}
|
||||
|
@ -176,6 +177,9 @@ func (s *settingsObject) Close() error {
|
|||
func (s *settingsObject) DeleteSpace(ctx context.Context, deleterId string, raw *treechangeproto.RawTreeChangeWithId) (err error) {
|
||||
s.Lock()
|
||||
defer s.Unlock()
|
||||
defer func() {
|
||||
log.Debug("finished adding delete change", zap.Error(err))
|
||||
}()
|
||||
err = s.verifyDeleteSpace(deleterId, raw)
|
||||
if err != nil {
|
||||
return
|
||||
|
@ -188,7 +192,8 @@ func (s *settingsObject) DeleteSpace(ctx context.Context, deleterId string, raw
|
|||
return
|
||||
}
|
||||
if !slices.Contains(res.Heads, raw.Id) {
|
||||
return ErrCantDeleteSpace
|
||||
err = ErrCantDeleteSpace
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ func (s *stateBuilder) Build(tr objecttree.ObjectTree, oldState *State, isUpdate
|
|||
if startId == "" {
|
||||
startId = rootId
|
||||
}
|
||||
err = tr.IterateFrom(state.LastIteratedId, convert, process)
|
||||
err = tr.IterateFrom(startId, convert, process)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue