Skip to content

fix: don't panic on invalid log labels #110

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
merged 2 commits into from
Apr 17, 2021
Merged

fix: don't panic on invalid log labels #110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61ee281
fix: don't panic on invalid log labels
Stebalien Apr 17, 2021
967f31a
fix: improve invalid label error message
Stebalien Apr 17, 2021
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: 4 additions & 0 deletions setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ func configFromEnv() Config {
labelKVs := strings.Split(labels, ",")
for _, label := range labelKVs {
kv := strings.Split(label, "=")
if len(kv) != 2 {
fmt.Fprint(os.Stderr, "invalid label k/v: ", label)
continue
}
cfg.Labels[kv[0]] = kv[1]
}
}
Expand Down
2 changes: 1 addition & 1 deletion setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestLogLabels(t *testing.T) {
}()

// set the go-log labels env var
os.Setenv(envLoggingLabels, "app=example_app,dc=sjc-1")
os.Setenv(envLoggingLabels, "app=example_app,dc=sjc-1,foobar") // foobar to ensure we don't panic on bad input.
SetupLogging(configFromEnv())

log := getLogger("test")
Expand Down