Skip to content

fix(proxyd): log initialization #9785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felipe-op merged 2 commits into from
Mar 8, 2024
Merged

fix(proxyd): log initialization #9785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afec13c
fix(proxyd): log initialization
felipe-op Mar 6, 2024
e41e30c
update integration test as well
felipe-op Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions proxyd/cmd/proxyd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var (
func main() {
// Set up logger with a default INFO level in case we fail to parse flags.
// Otherwise the final critical log won't show what the parsing error was.
slog.SetDefault(slog.New(slog.NewJSONHandler(
log.SetDefault(log.NewLogger(slog.NewJSONHandler(
Comment thread
felipe-op marked this conversation as resolved.
os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo})))

log.Info("starting proxyd", "version", GitVersion, "commit", GitCommit, "date", GitDate)
Expand All @@ -50,7 +50,7 @@ func main() {
log.Warn("invalid server.log_level set: " + config.Server.LogLevel)
}
}
slog.SetDefault(slog.New(slog.NewJSONHandler(
log.SetDefault(log.NewLogger(slog.NewJSONHandler(
Comment thread
felipe-op marked this conversation as resolved.
os.Stdout, &slog.HandlerOptions{Level: logLevel})))

if config.Server.EnablePprof {
Expand Down
4 changes: 2 additions & 2 deletions proxyd/integration_tests/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,6 @@ func (h *ProxydWSClient) WriteControlMessage(msgType int, msg []byte) error {
}

func InitLogger() {
slog.SetDefault(slog.New(
log.NewTerminalHandlerWithLevel(os.Stdout, slog.LevelDebug, false)))
log.SetDefault(log.NewLogger(slog.NewJSONHandler(
os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug})))
Comment thread
felipe-op marked this conversation as resolved.
}