From d3b2850713dca8a62aea7c84b06b73f5209296fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Eduardo=20Jer=C3=A9z=20Gir=C3=B3n?= Date: Sat, 20 Jul 2024 00:34:51 -0600 Subject: [PATCH] Refactor config package and update logger usage --- internal/config/env.go | 3 ++- internal/config/helpers.go | 29 +++++++++++++++++------------ internal/config/logger.go | 15 --------------- 3 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 internal/config/logger.go diff --git a/internal/config/env.go b/internal/config/env.go index b5d6212..1a57352 100644 --- a/internal/config/env.go +++ b/internal/config/env.go @@ -1,6 +1,7 @@ package config import ( + "github.com/eduardolat/pgbackweb/internal/logger" "github.com/joho/godotenv" ) @@ -15,7 +16,7 @@ type Env struct { func GetEnv() *Env { err := godotenv.Load() if err == nil { - logInfo("using .env file") + logger.Info("using .env file") } env := &Env{ diff --git a/internal/config/helpers.go b/internal/config/helpers.go index 6baf622..c8bcaa0 100644 --- a/internal/config/helpers.go +++ b/internal/config/helpers.go @@ -4,6 +4,8 @@ import ( "errors" "os" "strconv" + + "github.com/eduardolat/pgbackweb/internal/logger" ) type getEnvAsStringParams struct { @@ -22,10 +24,11 @@ func getEnvAsString(params getEnvAsStringParams) *string { //nolint:all value, err := getEnvAsStringFunc(params) if err != nil { - logFatalError( - "error getting env variable", - "name", params.name, - "error", err, + logger.FatalError( + "error getting env variable", logger.KV{ + "name": params.name, + "error": err, + }, ) } @@ -65,10 +68,11 @@ func getEnvAsInt(params getEnvAsIntParams) *int { //nolint:all value, err := getEnvAsIntFunc(params) if err != nil { - logFatalError( - "error getting env variable", - "name", params.name, - "error", err, + logger.FatalError( + "error getting env variable", logger.KV{ + "name": params.name, + "error": err, + }, ) } @@ -114,10 +118,11 @@ func getEnvAsBool(params getEnvAsBoolParams) *bool { //nolint:all value, err := getEnvAsBoolFunc(params) if err != nil { - logFatalError( - "error getting env variable", - "name", params.name, - "error", err, + logger.FatalError( + "error getting env variable", logger.KV{ + "name": params.name, + "error": err, + }, ) } diff --git a/internal/config/logger.go b/internal/config/logger.go deleted file mode 100644 index 96f02f7..0000000 --- a/internal/config/logger.go +++ /dev/null @@ -1,15 +0,0 @@ -package config - -import ( - "log/slog" - "os" -) - -func logFatalError(msg string, args ...any) { - slog.Error(msg, args...) - os.Exit(1) -} - -func logInfo(msg string, args ...any) { - slog.Info(msg, args...) -}