Skip to content

Commit a9817b2

Browse files
fix: make log level configurable again
With the recent switch to the cast logging library, the log level argument of the agent and controller got unwired by accident. Support for it has been added again.
1 parent cb6edd2 commit a9817b2

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

cmd/agent/daemon/app/app.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@ type App struct {
6161
cfg *config.Config
6262
}
6363

64+
func parseLogLevel(lvlStr string) (slog.Level, error) {
65+
var lvl slog.Level
66+
67+
if err := lvl.UnmarshalText([]byte(lvlStr)); err != nil {
68+
return 0, err
69+
}
70+
71+
return lvl, nil
72+
}
73+
6474
func (a *App) Run(ctx context.Context) error {
6575
start := time.Now()
6676

@@ -69,9 +79,16 @@ func (a *App) Run(ctx context.Context) error {
6979
cfg := a.cfg
7080
podName := os.Getenv("POD_NAME")
7181

82+
logCfg := logging.DefaultTextHandlerConfig
83+
logLvl, err := parseLogLevel(cfg.LogLevel)
84+
if err != nil {
85+
return err
86+
}
87+
logCfg.Level = logLvl
88+
7289
var log *logging.Logger
7390
logHandlers := []logging.Handler{
74-
logging.NewTextHandler(logging.DefaultTextHandlerConfig),
91+
logging.NewTextHandler(logCfg),
7592
}
7693
var exporters []export.DataBatchWriter
7794
// Castai specific spetup if config is valid.

cmd/controller/app/app.go

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"errors"
77
"fmt"
8+
"log/slog"
89
"net"
910
"net/http"
1011
"net/http/pprof"
@@ -49,14 +50,32 @@ type App struct {
4950
kubeClient kubernetes.Interface
5051
}
5152

53+
func parseLogLevel(lvlStr string) (slog.Level, error) {
54+
var lvl slog.Level
55+
56+
if err := lvl.UnmarshalText([]byte(lvlStr)); err != nil {
57+
return 0, err
58+
}
59+
60+
return lvl, nil
61+
}
62+
5263
func (a *App) Run(ctx context.Context) error {
5364
cfg := a.cfg
5465
clientset := a.kubeClient
5566

5667
errg, ctx := errgroup.WithContext(ctx)
5768

69+
logCfg := logging.DefaultTextHandlerConfig
70+
logLvl, err := parseLogLevel(cfg.LogLevel)
71+
if err != nil {
72+
return err
73+
} else {
74+
logCfg.Level = logLvl
75+
}
76+
5877
logHandlers := []logging.Handler{
59-
logging.NewTextHandler(logging.DefaultTextHandlerConfig),
78+
logging.NewTextHandler(logCfg),
6079
}
6180
var castaiClient *castai.Client
6281
var log *logging.Logger

0 commit comments

Comments
 (0)