Merge pull request #110 from ipfs/fix/log-label-panic

fix: don't panic on invalid log labels
ipfs · Apr 17, 2021 · 8621457 · 8621457
2 parents fc55b72 + 967f31a
commit 8621457
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/setup.go b/setup.go
@@ -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]
  }
  }

diff --git a/setup_test.go b/setup_test.go
@@ -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")