github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Skip exec.LookPath if a specific gzip implementation is disabled

Browse Source 
Both pigz and igzip can be disabled via the environment variables.
If disabled, calling exec.LookPath and logging "not found" message is,
even in the debug level, doesn't make much sense.

Signed-off-by: Kazuyoshi Kato <kaz@fly.io>
This commit is contained in:
kaz 2023-10-06 09:20:08 -07:00 committed by Kazuyoshi Kato
parent 34378ec9b4
commit 535916d1d0
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
archive/compression/compression.go
View File

@ -303,27 +303,24 @@ func cmdStream(cmd *exec.Cmd, in io.Reader) (io.ReadCloser, error) {
} }
func detectCommand(path, disableEnvName string) string { func detectCommand(path, disableEnvName string) string {
// Check if this command is disabled via the env variable
value := os.Getenv(disableEnvName)
if value != "" {
disable, err := strconv.ParseBool(value)
if err != nil {
log.L.WithError(err).Warnf("could not parse %s: %s", disableEnvName, value)
}
if disable {
return ""
}
}
path, err := exec.LookPath(path) path, err := exec.LookPath(path)
if err != nil { if err != nil {
log.L.WithError(err).Debugf("%s not found", path) log.L.WithError(err).Debugf("%s not found", path)
return "" return ""
} }
// Check if this command is disabled via the env variable
value := os.Getenv(disableEnvName)
if value == "" {
return path
}
disable, err := strconv.ParseBool(value)
if err != nil {
log.L.WithError(err).Warnf("could not parse %s: %s", disableEnvName, value)
return path
}
if disable {
return ""
}
return path return path
} }