0ct0pu5/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drop the current transaction on failure, to avoid being locked in bad state

Browse source
This commit is contained in:
Thibault bui Koechlin 2020-06-03 14:01:00 +02:00
parent 78dc0c49fb
commit a7babadf36
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/sqlite/commit.go
View file

@ -5,8 +5,6 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/crowdsecurity/crowdsec/pkg/types" "github.com/crowdsecurity/crowdsec/pkg/types"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@ -16,13 +14,8 @@ func (c *Context) Flush() error {
defer c.lock.Unlock() defer c.lock.Unlock()
ret := c.tx.Commit() ret := c.tx.Commit()
if ret.Error != nil { if ret.Error != nil {
/*if the database is locked, don't overwrite the current transaction*/
if ret.Error == sqlite3.ErrLocked {
log.Errorf("sqlite commit : db is locked : %s", ret.Error)
return ret.Error
}
/*if it's another error, create a new transaction to avoid locking ourselves in a bad state ?*/
c.tx = c.Db.Begin() c.tx = c.Db.Begin()
return fmt.Errorf("failed to commit records : %v", ret.Error) return fmt.Errorf("failed to commit records : %v", ret.Error)
} }