anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 17:44:59 +09:00
Code Activity

GO-5611 fix exit

Browse source
This commit is contained in:
Roman Khafizianov 2025-05-09 15:36:29 +02:00
parent b485c5438a
commit c91b54f94b
No known key found for this signature in database
GPG key ID: F07A7D55A2684852
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
space/internal/components/spaceloader/loadingspace.go
View file

@ -101,14 +101,14 @@ func (ls *loadingSpace) loadRetry(ctx context.Context) {
func (ls *loadingSpace) load(ctx context.Context) (notRetryable bool) {
sp, err := ls.spaceServiceProvider.open(ctx)
if errors.Is(err, spacesyncproto.ErrSpaceMissing) {
log.WarnCtx(ctx, "space load: space is missing", zap.String("spaceId", ls.ID), zap.Bool("disableRemoteLoad", ls.disableRemoteLoad), zap.Error(err))
log.WarnCtx(ctx, "space load: space is missing", zap.String("spaceId", ls.ID), zap.Bool("notRetryable", ls.disableRemoteLoad), zap.Error(err))
return ls.disableRemoteLoad
}
if err == nil {
err = sp.WaitMandatoryObjects(ctx)
if err != nil {
notRetryable = errors.Is(err, objecttree.ErrHasInvalidChanges)
log.WarnCtx(ctx, "space load: mandatory objects error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("disableRemoteLoad", ls.disableRemoteLoad), zap.Bool("notRetryable", notRetryable))
log.WarnCtx(ctx, "space load: mandatory objects error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", ls.disableRemoteLoad || notRetryable))
return ls.disableRemoteLoad || notRetryable
}
}
@ -121,12 +121,12 @@ func (ls *loadingSpace) load(ctx context.Context) (notRetryable bool) {
}
ls.setLoadErr(err)
if errors.Is(err, context.Canceled) {
log.WarnCtx(ctx, "space load: error: context bug", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("disableRemoteLoad", ls.disableRemoteLoad))
log.WarnCtx(ctx, "space load: error: context bug", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", ls.disableRemoteLoad))
// hotfix for drpc bug
// todo: remove after https://github.com/anyproto/any-sync/pull/448 got integrated
return false
return ls.disableRemoteLoad
}
log.WarnCtx(ctx, "space load: error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("disableRemoteLoad", ls.disableRemoteLoad))
log.WarnCtx(ctx, "space load: error", zap.String("spaceId", ls.ID), zap.Error(err), zap.Bool("notRetryable", ls.disableRemoteLoad))
} else {
if ls.latestAclHeadId != "" && !ls.disableRemoteLoad {
acl := sp.CommonSpace().Acl()