diff --git a/core/agents/agents_suite_test.go b/core/agents/agents_suite_test.go index 3d225b07..54b3f093 100644 --- a/core/agents/agents_suite_test.go +++ b/core/agents/agents_suite_test.go @@ -11,7 +11,7 @@ import ( func TestAgents(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Agents Test Suite") } diff --git a/core/agents/lastfm/lastfm_suite_test.go b/core/agents/lastfm/lastfm_suite_test.go index db09226e..d8092340 100644 --- a/core/agents/lastfm/lastfm_suite_test.go +++ b/core/agents/lastfm/lastfm_suite_test.go @@ -11,7 +11,7 @@ import ( func TestLastFM(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "LastFM Test Suite") } diff --git a/core/agents/listenbrainz/listenbrainz_suite_test.go b/core/agents/listenbrainz/listenbrainz_suite_test.go index 69cb9746..64abbe46 100644 --- a/core/agents/listenbrainz/listenbrainz_suite_test.go +++ b/core/agents/listenbrainz/listenbrainz_suite_test.go @@ -11,7 +11,7 @@ import ( func TestListenBrainz(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "ListenBrainz Test Suite") } diff --git a/core/agents/spotify/spotify_suite_test.go b/core/agents/spotify/spotify_suite_test.go index 1c8038e9..275b05e7 100644 --- a/core/agents/spotify/spotify_suite_test.go +++ b/core/agents/spotify/spotify_suite_test.go @@ -11,7 +11,7 @@ import ( func TestSpotify(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Spotify Test Suite") } diff --git a/core/auth/auth_test.go b/core/auth/auth_test.go index 0ac10ebe..a1908e12 100644 --- a/core/auth/auth_test.go +++ b/core/auth/auth_test.go @@ -15,7 +15,7 @@ import ( ) func TestAuth(t *testing.T) { - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Auth Test Suite") } diff --git a/core/core_suite_test.go b/core/core_suite_test.go index fdb792d9..afa5fd91 100644 --- a/core/core_suite_test.go +++ b/core/core_suite_test.go @@ -11,7 +11,7 @@ import ( func TestCore(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Core Suite") } diff --git a/core/scrobbler/scrobbler_suite_test.go b/core/scrobbler/scrobbler_suite_test.go index 6963f6c3..9ec3ba12 100644 --- a/core/scrobbler/scrobbler_suite_test.go +++ b/core/scrobbler/scrobbler_suite_test.go @@ -11,7 +11,7 @@ import ( func TestAgents(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Scrobbler Test Suite") } diff --git a/core/transcoder/transcoder_test.go b/core/transcoder/transcoder_test.go index a91d3b6b..82722f7e 100644 --- a/core/transcoder/transcoder_test.go +++ b/core/transcoder/transcoder_test.go @@ -11,7 +11,7 @@ import ( func TestTranscoder(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Transcoder Suite") } diff --git a/db/db.go b/db/db.go index 92acce3b..74df90fe 100644 --- a/db/db.go +++ b/db/db.go @@ -3,7 +3,6 @@ package db import ( "database/sql" "fmt" - "os" _ "github.com/mattn/go-sqlite3" "github.com/navidrome/navidrome/conf" @@ -59,21 +58,18 @@ func EnsureLatestVersion() { err = goose.SetDialect(Driver) if err != nil { - log.Error("Invalid DB driver", "driver", Driver, err) - os.Exit(1) + log.Fatal("Invalid DB driver", "driver", Driver, err) } err = goose.Run("up", db, "./") if err != nil { - log.Error("Failed to apply new migrations", err) - os.Exit(1) + log.Fatal("Failed to apply new migrations", err) } } 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) + log.Fatal("Database could not be opened!", err) } defer rows.Close() return !rows.Next() @@ -84,13 +80,11 @@ type logAdapter struct { } func (l *logAdapter) Fatal(v ...interface{}) { - log.Error(fmt.Sprint(v...)) - os.Exit(-1) + log.Fatal(fmt.Sprint(v...)) } func (l *logAdapter) Fatalf(format string, v ...interface{}) { - log.Error(fmt.Sprintf(format, v...)) - os.Exit(-1) + log.Fatal(fmt.Sprintf(format, v...)) } func (l *logAdapter) Print(v ...interface{}) { diff --git a/db/db_test.go b/db/db_test.go index 50415260..d367984a 100644 --- a/db/db_test.go +++ b/db/db_test.go @@ -12,7 +12,7 @@ import ( func TestDB(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "DB Suite") } diff --git a/log/log.go b/log/log.go index 1f2a9328..1fc8a606 100644 --- a/log/log.go +++ b/log/log.go @@ -41,12 +41,12 @@ var redacted = &Hook{ } const ( - LevelCritical = Level(logrus.FatalLevel) // TODO Rename to LevelFatal - LevelError = Level(logrus.ErrorLevel) - LevelWarn = Level(logrus.WarnLevel) - LevelInfo = Level(logrus.InfoLevel) - LevelDebug = Level(logrus.DebugLevel) - LevelTrace = Level(logrus.TraceLevel) + LevelFatal = Level(logrus.FatalLevel) + LevelError = Level(logrus.ErrorLevel) + LevelWarn = Level(logrus.WarnLevel) + LevelInfo = Level(logrus.InfoLevel) + LevelDebug = Level(logrus.DebugLevel) + LevelTrace = Level(logrus.TraceLevel) ) type contextKey string @@ -82,8 +82,8 @@ func levelFromString(l string) Level { envLevel := strings.ToLower(l) var level Level switch envLevel { - case "critical": - level = LevelCritical + case "fatal": + level = LevelFatal case "error": level = LevelError case "warn": @@ -147,7 +147,7 @@ func CurrentLevel() Level { } func Fatal(args ...interface{}) { - log(LevelCritical, args...) + log(LevelFatal, args...) os.Exit(1) } diff --git a/log/log_test.go b/log/log_test.go index 3c4cde54..545803a7 100644 --- a/log/log_test.go +++ b/log/log_test.go @@ -167,9 +167,9 @@ var _ = Describe("Logger", func() { }) Describe("SetLevelString", func() { - It("converts Critical level", func() { - SetLevelString("Critical") - Expect(CurrentLevel()).To(Equal(LevelCritical)) + It("converts Fatal level", func() { + SetLevelString("Fatal") + Expect(CurrentLevel()).To(Equal(LevelFatal)) }) It("converts Error level", func() { SetLevelString("ERROR") diff --git a/model/criteria/criteria_suite_test.go b/model/criteria/criteria_suite_test.go index 9afe9167..52175ae9 100644 --- a/model/criteria/criteria_suite_test.go +++ b/model/criteria/criteria_suite_test.go @@ -10,7 +10,7 @@ import ( ) func TestCriteria(t *testing.T) { - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) gomega.RegisterFailHandler(Fail) RunSpecs(t, "Criteria Suite") } diff --git a/model/model_suite_test.go b/model/model_suite_test.go index fb740b09..39184edc 100644 --- a/model/model_suite_test.go +++ b/model/model_suite_test.go @@ -12,7 +12,7 @@ import ( func TestModel(t *testing.T) { tests.Init(t, true) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Model Suite") } diff --git a/persistence/persistence_test.go b/persistence/persistence_test.go index 347bdd17..ec9ea340 100644 --- a/persistence/persistence_test.go +++ b/persistence/persistence_test.go @@ -16,7 +16,7 @@ var _ = Describe("SQLStore", func() { BeforeEach(func() { ds = New(db.Db()) ctx = context.Background() - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) }) AfterEach(func() { log.SetLevel(log.LevelError) diff --git a/scanner/metadata/ffmpeg/ffmpeg_suite_test.go b/scanner/metadata/ffmpeg/ffmpeg_suite_test.go index 28f9440d..81594038 100644 --- a/scanner/metadata/ffmpeg/ffmpeg_suite_test.go +++ b/scanner/metadata/ffmpeg/ffmpeg_suite_test.go @@ -11,7 +11,7 @@ import ( func TestFFMpeg(t *testing.T) { tests.Init(t, true) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "FFMpeg Suite") } diff --git a/scanner/metadata/metadata_suite_test.go b/scanner/metadata/metadata_suite_test.go index dc2585dd..095895d6 100644 --- a/scanner/metadata/metadata_suite_test.go +++ b/scanner/metadata/metadata_suite_test.go @@ -11,7 +11,7 @@ import ( func TestMetadata(t *testing.T) { tests.Init(t, true) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Metadata Suite") } diff --git a/scanner/metadata/taglib/taglib_suite_test.go b/scanner/metadata/taglib/taglib_suite_test.go index 31578b93..2b26612c 100644 --- a/scanner/metadata/taglib/taglib_suite_test.go +++ b/scanner/metadata/taglib/taglib_suite_test.go @@ -11,7 +11,7 @@ import ( func TestTagLib(t *testing.T) { tests.Init(t, true) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "TagLib Suite") } diff --git a/scanner/scanner_suite_test.go b/scanner/scanner_suite_test.go index cd9e07cd..402532dd 100644 --- a/scanner/scanner_suite_test.go +++ b/scanner/scanner_suite_test.go @@ -17,7 +17,7 @@ func TestScanner(t *testing.T) { conf.Server.DbPath = "file::memory:?cache=shared" _ = orm.RegisterDataBase("default", db.Driver, conf.Server.DbPath) db.EnsureLatestVersion() - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Scanner Suite") } diff --git a/server/events/events_suite_test.go b/server/events/events_suite_test.go index b3462f27..ecc186ca 100644 --- a/server/events/events_suite_test.go +++ b/server/events/events_suite_test.go @@ -11,7 +11,7 @@ import ( func TestEvents(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Events Suite") } diff --git a/server/nativeapi/native_api_suite_test.go b/server/nativeapi/native_api_suite_test.go index 2f6cb018..70cd7b28 100644 --- a/server/nativeapi/native_api_suite_test.go +++ b/server/nativeapi/native_api_suite_test.go @@ -11,7 +11,7 @@ import ( func TestNativeApi(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Native RESTful API Suite") } diff --git a/server/server_suite_test.go b/server/server_suite_test.go index 8739c240..761983ef 100644 --- a/server/server_suite_test.go +++ b/server/server_suite_test.go @@ -11,7 +11,7 @@ import ( func TestServer(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Server Suite") } diff --git a/server/subsonic/api_suite_test.go b/server/subsonic/api_suite_test.go index f4e8a311..4d5b293e 100644 --- a/server/subsonic/api_suite_test.go +++ b/server/subsonic/api_suite_test.go @@ -9,7 +9,7 @@ import ( ) func TestSubsonicApi(t *testing.T) { - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Subsonic API Suite") } diff --git a/utils/cache/cache_suite_test.go b/utils/cache/cache_suite_test.go index 7246008b..8c0d2897 100644 --- a/utils/cache/cache_suite_test.go +++ b/utils/cache/cache_suite_test.go @@ -11,7 +11,7 @@ import ( func TestCache(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Cache Suite") } diff --git a/utils/gravatar/gravatar_test.go b/utils/gravatar/gravatar_test.go index 75c0b840..a66c25af 100644 --- a/utils/gravatar/gravatar_test.go +++ b/utils/gravatar/gravatar_test.go @@ -12,7 +12,7 @@ import ( func TestGravatar(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Gravatar Test Suite") } diff --git a/utils/pool/pool_test.go b/utils/pool/pool_test.go index f8d723f5..c6c59e7e 100644 --- a/utils/pool/pool_test.go +++ b/utils/pool/pool_test.go @@ -12,7 +12,7 @@ import ( func TestPool(t *testing.T) { tests.Init(t, false) - log.SetLevel(log.LevelCritical) + log.SetLevel(log.LevelFatal) RegisterFailHandler(Fail) RunSpecs(t, "Pool Suite") }