blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: improve logging of database consistency checks

Browse Source 
The log messages now all start with `database: `.

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2023-07-18 16:12:26 +02:00
parent 4121c899c3
commit 1a79c19583
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/manager/persistence/integrity.go
View File

@ -74,26 +74,26 @@ func (db *DB) pragmaIntegrityCheck(ctx context.Context) (ok bool) {
Raw("PRAGMA integrity_check"). Raw("PRAGMA integrity_check").
Scan(&issues) Scan(&issues)
if tx.Error != nil { if tx.Error != nil {
log.Error().Err(tx.Error).Msg("database error checking integrity") log.Error().Err(tx.Error).Msg("database: error checking integrity")
return false return false
} }
switch len(issues) { switch len(issues) {
case 0: case 0:
log.Warn().Msg("database integrity check returned nothing, expected explicit 'ok'; treating as an implicit 'ok'") log.Warn().Msg("database: integrity check returned nothing, expected explicit 'ok'; treating as an implicit 'ok'")
return true return true
case 1: case 1:
if issues[0].Description == "ok" { if issues[0].Description == "ok" {
log.Debug().Msg("database integrity check ok") log.Debug().Msg("database: integrity check ok")
return true return true
} }
} }
log.Error().Int("num_issues", len(issues)).Msg("database integrity check failed") log.Error().Int("num_issues", len(issues)).Msg("database: integrity check failed")
for _, issue := range issues { for _, issue := range issues {
log.Error(). log.Error().
Str("description", issue.Description). Str("description", issue.Description).
Msg("database integrity check failure") Msg("database: integrity check failure")
} }
return false return false
@ -115,23 +115,23 @@ func (db *DB) pragmaForeignKeyCheck(ctx context.Context) (ok bool) {
Raw("PRAGMA foreign_key_check"). Raw("PRAGMA foreign_key_check").
Scan(&issues) Scan(&issues)
if tx.Error != nil { if tx.Error != nil {
log.Error().Err(tx.Error).Msg("database error checking foreign keys") log.Error().Err(tx.Error).Msg("database: error checking foreign keys")
return false return false
} }
if len(issues) == 0 { if len(issues) == 0 {
log.Debug().Msg("database foreign key check ok") log.Debug().Msg("database: foreign key check ok")
return true return true
} }
log.Error().Int("num_issues", len(issues)).Msg("database foreign key check failed") log.Error().Int("num_issues", len(issues)).Msg("database: foreign key check failed")
for _, issue := range issues { for _, issue := range issues {
log.Error(). log.Error().
Str("table", issue.Table). Str("table", issue.Table).
Int("rowid", issue.RowID). Int("rowid", issue.RowID).
Str("parent", issue.Parent). Str("parent", issue.Parent).
Int("fkid", issue.FKID). Int("fkid", issue.FKID).
Msg("database foreign key relation missing") Msg("database: foreign key relation missing")
} }
return false return false