Skip to content

Commit ca74949

Browse files
committed
fix log level from config
1 parent b38f39d commit ca74949

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

cmd/ctf01d/main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,18 @@ import (
1515
)
1616

1717
func main() {
18-
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
19-
slog.SetDefault(logger)
2018

2119
cfg, err := config.NewConfig()
2220
if err != nil {
2321
slog.Error("Config error: " + err.Error())
22+
os.Exit(1)
2423
}
24+
logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
25+
Level: slog.Level(
26+
cfg.ParseLogLevel(cfg.Log.Level),
27+
),
28+
}))
29+
slog.SetDefault(logger)
2530
db, err := database.InitDatabase()
2631
if err != nil {
2732
slog.Error("Error opening database connection: " + err.Error())

config/config.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package config
22

33
import (
44
"fmt"
5+
"log/slog"
56

67
"github.com/ilyakaznacheev/cleanenv"
78
)
@@ -19,7 +20,7 @@ type (
1920
}
2021

2122
Log struct {
22-
Level string `env-required:"true" yaml:"log_level" env:"LOG_LEVEL"`
23+
Level string `env-required:"true" yaml:"log_level" env:"LOG_LEVEL"`
2324
}
2425

2526
DB struct {
@@ -43,3 +44,18 @@ func NewConfig() (*Config, error) {
4344

4445
return cfg, nil
4546
}
47+
48+
func (c *Config) ParseLogLevel(level string) slog.Level {
49+
switch level {
50+
case "debug":
51+
return slog.LevelDebug
52+
case "info":
53+
return slog.LevelInfo
54+
case "warn":
55+
return slog.LevelWarn
56+
case "error":
57+
return slog.LevelError
58+
default:
59+
return slog.LevelInfo
60+
}
61+
}

internal/app/database/struct_updater.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func InitDatabase() (*sql.DB, error) {
178178
installedSomeUpdate = false
179179
installedUpdates, _ := getInstalledDatabaseVersions(db)
180180
for _, installed_update_id := range installedUpdates {
181-
// slog.Info("installed_update: " + installed_update_id)
181+
slog.Debug("installed_update: " + installed_update_id)
182182
updates, found_update := allUpdates[installed_update_id]
183183
if found_update {
184184
for _, update_func := range updates {

internal/app/handlers/sessions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (h *Handlers) PostApiV1AuthSignIn(w http.ResponseWriter, r *http.Request) {
2828
}
2929

3030
repo := repository.NewSessionRepository(h.DB)
31-
// slog.Info("user.Id " + openapi_types.UUID(user.Id).String())
31+
slog.Debug("user.Id " + openapi_types.UUID(user.Id).String())
3232

3333
sessionId, err := repo.StoreSessionInDB(r.Context(), user.Id)
3434
if err != nil {
@@ -78,7 +78,7 @@ func (h *Handlers) ValidateSession(w http.ResponseWriter, r *http.Request) {
7878
api_helpers.RespondWithJSON(w, http.StatusUnauthorized, map[string]string{"error": "No session found"})
7979
return
8080
}
81-
// slog.Info("cookie.Value, " + cookie.Value)
81+
slog.Debug("cookie.Value, " + cookie.Value)
8282
repo := repository.NewSessionRepository(h.DB)
8383
var userId openapi_types.UUID
8484
userId, err = repo.GetSessionFromDB(r.Context(), cookie.Value)
@@ -87,7 +87,7 @@ func (h *Handlers) ValidateSession(w http.ResponseWriter, r *http.Request) {
8787
api_helpers.RespondWithJSON(w, http.StatusUnauthorized, map[string]string{"error": "No user or session found"})
8888
return
8989
}
90-
// slog.Info("ValidateSession user.Id " + openapi_types.UUID(userId).String())
90+
slog.Debug("ValidateSession user.Id " + openapi_types.UUID(userId).String())
9191

9292
userRepo := repository.NewUserRepository(h.DB)
9393
user, err := userRepo.GetById(r.Context(), userId)

0 commit comments

Comments
 (0)