mirror of
https://github.com/navidrome/navidrome.git
synced 2025-04-04 21:17:37 +03:00
Suppress logs of successful DB migrations applied when running for the first time
This commit is contained in:
parent
0cbb0acad3
commit
4853760fb5
2 changed files with 61 additions and 5 deletions
30
db/db.go
30
db/db.go
|
@ -42,7 +42,6 @@ func Db() *sql.DB {
|
||||||
|
|
||||||
func EnsureLatestVersion() {
|
func EnsureLatestVersion() {
|
||||||
db := Db()
|
db := Db()
|
||||||
goose.SetLogger(&logAdapter{})
|
|
||||||
|
|
||||||
// Disable foreign_keys to allow re-creating tables in migrations
|
// Disable foreign_keys to allow re-creating tables in migrations
|
||||||
_, err := db.Exec("PRAGMA foreign_keys=off")
|
_, err := db.Exec("PRAGMA foreign_keys=off")
|
||||||
|
@ -56,6 +55,9 @@ func EnsureLatestVersion() {
|
||||||
log.Error("Error disabling foreign_keys", err)
|
log.Error("Error disabling foreign_keys", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gooseLogger := &logAdapter{silent: isSchemaEmpty(db)}
|
||||||
|
goose.SetLogger(gooseLogger)
|
||||||
|
|
||||||
err = goose.SetDialect(Driver)
|
err = goose.SetDialect(Driver)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Invalid DB driver", "driver", Driver, err)
|
log.Error("Invalid DB driver", "driver", Driver, err)
|
||||||
|
@ -68,7 +70,19 @@ func EnsureLatestVersion() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type logAdapter struct{}
|
func isSchemaEmpty(db *sql.DB) bool { // nolint:interfacer
|
||||||
|
rows, err := db.Query("SELECT name FROM sqlite_master WHERE type='table' AND name='goose_db_version';") // nolint:rowserrcheck
|
||||||
|
if err != nil {
|
||||||
|
log.Error("Database could not be opened!", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
return !rows.Next()
|
||||||
|
}
|
||||||
|
|
||||||
|
type logAdapter struct {
|
||||||
|
silent bool
|
||||||
|
}
|
||||||
|
|
||||||
func (l *logAdapter) Fatal(v ...interface{}) {
|
func (l *logAdapter) Fatal(v ...interface{}) {
|
||||||
log.Error(fmt.Sprint(v...))
|
log.Error(fmt.Sprint(v...))
|
||||||
|
@ -81,13 +95,19 @@ func (l *logAdapter) Fatalf(format string, v ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *logAdapter) Print(v ...interface{}) {
|
func (l *logAdapter) Print(v ...interface{}) {
|
||||||
log.Info(fmt.Sprint(v...))
|
if !l.silent {
|
||||||
|
log.Info(fmt.Sprint(v...))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *logAdapter) Println(v ...interface{}) {
|
func (l *logAdapter) Println(v ...interface{}) {
|
||||||
log.Info(fmt.Sprintln(v...))
|
if !l.silent {
|
||||||
|
log.Info(fmt.Sprintln(v...))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *logAdapter) Printf(format string, v ...interface{}) {
|
func (l *logAdapter) Printf(format string, v ...interface{}) {
|
||||||
log.Info(fmt.Sprintf(format, v...))
|
if !l.silent {
|
||||||
|
log.Info(fmt.Sprintf(format, v...))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
36
db/db_test.go
Normal file
36
db/db_test.go
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/navidrome/navidrome/log"
|
||||||
|
"github.com/navidrome/navidrome/tests"
|
||||||
|
. "github.com/onsi/ginkgo"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDB(t *testing.T) {
|
||||||
|
tests.Init(t, false)
|
||||||
|
log.SetLevel(log.LevelCritical)
|
||||||
|
RegisterFailHandler(Fail)
|
||||||
|
RunSpecs(t, "DB Suite")
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ = Describe("isSchemaEmpty", func() {
|
||||||
|
var db *sql.DB
|
||||||
|
BeforeEach(func() {
|
||||||
|
path := "file::memory:"
|
||||||
|
db, _ = sql.Open(Driver, path)
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns false if the goose metadata table is found", func() {
|
||||||
|
_, err := db.Exec("create table goose_db_version (id primary key);")
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(isSchemaEmpty(db)).To(BeFalse())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("returns true if the schema is brand new", func() {
|
||||||
|
Expect(isSchemaEmpty(db)).To(BeTrue())
|
||||||
|
})
|
||||||
|
})
|
Loading…
Add table
Add a link
Reference in a new issue