Refactor config package and update logger usage

This commit is contained in:
Luis Eduardo Jeréz Girón
2024-07-20 00:34:51 -06:00
parent 5de759cc92
commit d3b2850713
3 changed files with 19 additions and 28 deletions

View File

@@ -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{

View File

@@ -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,
},
)
}

View File

@@ -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...)
}