Make sure to log errors from DaemonInfo

pull/11708/head
Anders F Björklund 2021-06-20 10:24:14 +02:00
parent 49f9bc868a
commit 3b533a07cb
1 changed files with 4 additions and 0 deletions

View File

@ -252,9 +252,11 @@ func dockerSystemInfo() (dockerSysInfo, error) {
var ds dockerSysInfo
rawJSON, err := dockerInfoGetter()
if err != nil {
klog.Warningf("docker info: %v", err)
return ds, errors.Wrap(err, "docker system info")
}
if err := json.Unmarshal([]byte(strings.TrimSpace(rawJSON)), &ds); err != nil {
klog.Warningf("unmarshal docker info: %v", err)
return ds, errors.Wrapf(err, "unmarshal docker system info")
}
@ -272,10 +274,12 @@ func podmanSystemInfo() (podmanSysInfo, error) {
var ps podmanSysInfo
rawJSON, err := podmanInfoGetter()
if err != nil {
klog.Warningf("podman info: %v", err)
return ps, errors.Wrap(err, "podman system info")
}
if err := json.Unmarshal([]byte(strings.TrimSpace(rawJSON)), &ps); err != nil {
klog.Warningf("unmarshal podman info: %v", err)
return ps, errors.Wrapf(err, "unmarshal podman system info")
}
klog.Infof("podman info: %+v", ps)