n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

hicli/sync: fix detecting db lock errors

Browse source
This commit is contained in:
Tulir Asokan 2024-12-23 22:46:10 +02:00
parent b563c31a27
commit 5fbb8a21ab
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/hicli/syncwrap.go
View file

@ -13,6 +13,7 @@ import (
"time" "time"
"github.com/mattn/go-sqlite3" "github.com/mattn/go-sqlite3"
"github.com/rs/zerolog"
"maunium.net/go/mautrix" "maunium.net/go/mautrix"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
@ -46,7 +47,9 @@ func (h *hiSyncer) ProcessResponse(ctx context.Context, resp *mautrix.RespSync,
err = c.DB.DoTxn(ctx, nil, func(ctx context.Context) error { err = c.DB.DoTxn(ctx, nil, func(ctx context.Context) error {
return c.processSyncResponse(ctx, resp, since) return c.processSyncResponse(ctx, resp, since)
}) })
if errors.Is(err, sqlite3.ErrLocked) && i < 24 { var sqliteErr sqlite3.Error
if errors.As(err, &sqliteErr) && sqliteErr.Code == sqlite3.ErrBusy && i < 24 {
zerolog.Ctx(ctx).Warn().Err(err).Msg("Database is busy, retrying")
c.markSyncErrored(err, false) c.markSyncErrored(err, false)
continue continue
} else if err != nil { } else if err != nil {