Rename log.LevelCritical to log.LevelFatal

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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)
+		log.Fatal("Invalid DB driver", "driver", Driver, err)
-		os.Exit(1)
 	}
 	err = goose.Run("up", db, "./")
 	if err != nil {
-		log.Error("Failed to apply new migrations", err)
+		log.Fatal("Failed to apply new migrations", err)
-		os.Exit(1)
 	}
 }
 
 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)
+		log.Fatal("Database could not be opened!", err)
-		os.Exit(1)
 	}
 	defer rows.Close()
 	return !rows.Next()
@@ -84,13 +80,11 @@ type logAdapter struct {
 }
 
 func (l *logAdapter) Fatal(v ...interface{}) {
-	log.Error(fmt.Sprint(v...))
+	log.Fatal(fmt.Sprint(v...))
-	os.Exit(-1)
 }
 
 func (l *logAdapter) Fatalf(format string, v ...interface{}) {
-	log.Error(fmt.Sprintf(format, v...))
+	log.Fatal(fmt.Sprintf(format, v...))
-	os.Exit(-1)
 }
 
 func (l *logAdapter) Print(v ...interface{}) {

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")
 }

log/log.go

@@ -41,12 +41,12 @@ var redacted = &Hook{
 }
 
 const (
-	LevelCritical = Level(logrus.FatalLevel) // TODO Rename to LevelFatal
+	LevelFatal = Level(logrus.FatalLevel)
-	LevelError    = Level(logrus.ErrorLevel)
+	LevelError = Level(logrus.ErrorLevel)
-	LevelWarn     = Level(logrus.WarnLevel)
+	LevelWarn  = Level(logrus.WarnLevel)
-	LevelInfo     = Level(logrus.InfoLevel)
+	LevelInfo  = Level(logrus.InfoLevel)
-	LevelDebug    = Level(logrus.DebugLevel)
+	LevelDebug = Level(logrus.DebugLevel)
-	LevelTrace    = Level(logrus.TraceLevel)
+	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":
+	case "fatal":
-		level = LevelCritical
+		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)
 }
 

log/log_test.go

@@ -167,9 +167,9 @@ var _ = Describe("Logger", func() {
 	})
 
 	Describe("SetLevelString", func() {
-		It("converts Critical level", func() {
+		It("converts Fatal level", func() {
-			SetLevelString("Critical")
+			SetLevelString("Fatal")
-			Expect(CurrentLevel()).To(Equal(LevelCritical))
+			Expect(CurrentLevel()).To(Equal(LevelFatal))
 		})
 		It("converts Error level", func() {
 			SetLevelString("ERROR")

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")
 }

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")
 }

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)

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }

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")
 }