use new features of logr library

Author: garyhodgson

config/config.go

@@ -24,7 +24,6 @@ import (
 	"github.com/TwiN/gatus/v5/storage"
 	"github.com/TwiN/logr"
 	"gopkg.in/yaml.v3"
-	"hermannm.dev/enumnames"
 )
 
 const (
@@ -49,13 +48,6 @@ var (
 
 	// errEarlyReturn is returned to break out of a loop from a callback early
 	errEarlyReturn = errors.New("early escape")
-
-	LogLevels = enumnames.NewMap(map[logr.Level]string{
-		logr.LevelDebug: "DEBUG",
-		logr.LevelInfo:  "INFO",
-		logr.LevelWarn:  "WARN",
-		logr.LevelError: "ERROR",
-	})
 )
 
 // Config is the main configuration structure
@@ -64,7 +56,7 @@ type Config struct {
 	Debug bool `yaml:"debug,omitempty"`
 
 	// Log level: DEBUG, INFO, WARN, ERROR.  Default: INFO
-	LogLevel string `yaml:"log-level,omitempty"`
+	LogLevel logr.Level `yaml:"log-level,omitempty"`
 
 	// Metrics Whether to expose metrics at /metrics
 	Metrics bool `yaml:"metrics,omitempty"`
@@ -216,11 +208,6 @@ func LoadConfiguration(configPath string) (*Config, error) {
 	}
 	config.configPath = usedConfigPath
 	config.UpdateLastFileModTime()
-
-	if config.LogLevel == "" {
-		config.LogLevel = "INFO"
-	}
-
 	return config, err
 }
 

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/TwiN/g8/v2 v2.0.0
 	github.com/TwiN/gocache/v2 v2.2.2
 	github.com/TwiN/health v1.6.0
-	github.com/TwiN/logr v0.0.2
+	github.com/TwiN/logr v0.2.1
 	github.com/TwiN/whois v1.1.9
 	github.com/aws/aws-sdk-go v1.54.10
 	github.com/coreos/go-oidc/v3 v3.10.0
@@ -31,7 +31,6 @@ require (
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.33.1
-	hermannm.dev/enumnames v0.2.1
 )
 
 require (

go.sum

@@ -16,8 +16,8 @@ github.com/TwiN/gocache/v2 v2.2.2 h1:4HToPfDV8FSbaYO5kkbhLpEllUYse5rAf+hVU/mSsuI
 github.com/TwiN/gocache/v2 v2.2.2/go.mod h1:WfIuwd7GR82/7EfQqEtmLFC3a2vqaKbs4Pe6neB7Gyc=
 github.com/TwiN/health v1.6.0 h1:L2ks575JhRgQqWWOfKjw9B0ec172hx7GdToqkYUycQM=
 github.com/TwiN/health v1.6.0/go.mod h1:Z6TszwQPMvtSiVx1QMidVRgvVr4KZGfiwqcD7/Z+3iw=
-github.com/TwiN/logr v0.0.2 h1:BGlNtfx8ni6zvylSsdB8xMv0PSTVBQf9LKtcfK24P2U=
-github.com/TwiN/logr v0.0.2/go.mod h1:oldDOkRjFXjZqiMP0+ca5NAQHXTiJ02zHirsuBJJH6k=
+github.com/TwiN/logr v0.2.1 h1:kMhUmBBVlFxzqTvyHuNoYQ/uwqg8BW4y0AyZxI5JB3Q=
+github.com/TwiN/logr v0.2.1/go.mod h1:oldDOkRjFXjZqiMP0+ca5NAQHXTiJ02zHirsuBJJH6k=
 github.com/TwiN/whois v1.1.9 h1:m20+m1CXnrstie+tW2ZmAJkfcT9zgwpVRUFsKeMw+ng=
 github.com/TwiN/whois v1.1.9/go.mod h1:TjipCMpJRAJYKmtz/rXQBU6UGxMh6bk8SHazu7OMnQE=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
@@ -327,8 +327,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-hermannm.dev/enumnames v0.2.1 h1:e9Qw5DlF5QVoxglnSPU2gjpHtmWUByqXrig97wZ14sU=
-hermannm.dev/enumnames v0.2.1/go.mod h1:Zlyt21mTyqMUcec/vMhxxSNUKkL7TVwskge2zaxOaEE=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=

main.go

@@ -62,16 +62,8 @@ func save() {
 }
 
 func configureLogging(cfg *config.Config) {
-
-	if config.LogLevels.ContainsName(cfg.LogLevel) {
-		log.Printf("[main.configureLogging] Log Level is %s", cfg.LogLevel)
-		key, ok := config.LogLevels.GetKey(cfg.LogLevel)
-		if ok {
-			logr.SetThreshold(key)
-		}
-	} else {
-		log.Printf("[main.configureLogging] Unrecognised log level '%s', defaulting to INFO. Allowed values are [DEBUG, INFO, WARN, ERROR]", cfg.LogLevel)
-	}
+	logr.SetThreshold(cfg.LogLevel)
+	logr.Infof("[main.configureLogging] Log Level is %s", logr.GetThreshold())
 }
 
 func loadConfiguration() (*config.Config, error) {