prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1590 from cvlc/check-empty-for-env-vars

Browse Source 
check docker container environment variables for empty strings
This commit is contained in:
Tim St. Clair 2017-02-08 17:08:26 -08:00 committed by GitHub
commit be5b9990fc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container/docker/handler.go
View File

@ -252,9 +252,11 @@ func newDockerContainerHandler(
// split env vars to get metadata map. // split env vars to get metadata map.
for _, exposedEnv := range metadataEnvs { for _, exposedEnv := range metadataEnvs {
for _, envVar := range ctnr.Config.Env { for _, envVar := range ctnr.Config.Env {
splits := strings.SplitN(envVar, "=", 2) if envVar != "" {
if splits[0] == exposedEnv { splits := strings.SplitN(envVar, "=", 2)
handler.envs[strings.ToLower(exposedEnv)] = splits[1] if len(splits) == 2 && splits[0] == exposedEnv {
handler.envs[strings.ToLower(exposedEnv)] = splits[1]
}
} }
} }
} }