kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #585 from mslacken/fix-container-list

Browse Source 
react on the error accordingly
This commit is contained in:
Christian Goll
2022-12-09 09:53:01 +01:00
committed by GitHub
parent b80ad41732 241425f525
commit c7abc078bf
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/pkg/api/container/container.go
View File

@@ -293,14 +293,19 @@ func ContainerList() (containerInfo []*wwapiv1.ContainerInfo, err error) {
wwlog.Debug("Finding kernel version for: %s", source)
kernelVersion := container.KernelVersion(source)
creationTime, err := os.Stat(container.SourceDir(source))
var creationTime uint64
sourceStat, err := os.Stat(container.SourceDir(source))
if err != nil {
wwlog.Error("%s\n", err)
} else {
creationTime = uint64(sourceStat.ModTime().Unix())
}
modTime, err := os.Stat(container.ImageFile(source))
var modTime uint64
imageStat, err := os.Stat(container.ImageFile(source))
if err != nil {
wwlog.Error("%s\n", err)
} else {
modTime = uint64(imageStat.ModTime().Unix())
}
size, err := util.DirSize(container.SourceDir(source))
if err != nil {
@@ -309,20 +314,22 @@ func ContainerList() (containerInfo []*wwapiv1.ContainerInfo, err error) {
imgSize, err := os.Stat(container.ImageFile(source))
if err != nil {
wwlog.Error("%s\n", err)
} else {
size += imgSize.Size()
}
size += imgSize.Size()
imgSize, err = os.Stat(container.ImageFile(source) + ".gz")
if err != nil {
wwlog.Error("%s\n", err)
} else {
size += imgSize.Size()
}
size += imgSize.Size()
containerInfo = append(containerInfo, &wwapiv1.ContainerInfo{
Name: source,
NodeCount: uint32(nodemap[source]),
KernelVersion: kernelVersion,
CreateDate: uint64(creationTime.ModTime().Unix()),
ModDate: uint64(modTime.ModTime().Unix()),
CreateDate: creationTime,
ModDate: modTime,
Size: uint64(size),
})