norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure tmp image is cleaned up on crash (addresses part of #58)

Browse Source
This commit is contained in:
Alex Goodman 2018-11-24 21:02:58 -05:00
parent 7d868096ca
commit b1962b9ae5
No known key found for this signature in database
GPG Key ID: 743640FAA11698A1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
image/image.go
View File

@ -361,12 +361,17 @@ func saveImage(imageID string) (string, string) {
tmpDir, err := ioutil.TempDir("", "dive") tmpDir, err := ioutil.TempDir("", "dive")
check(err) check(err)
cleanUpTmp := func() {
os.RemoveAll(tmpDir)
}
imageTarPath := filepath.Join(tmpDir, "image.tar") imageTarPath := filepath.Join(tmpDir, "image.tar")
imageFile, err := os.Create(imageTarPath) imageFile, err := os.Create(imageTarPath)
check(err) check(err)
defer func() { defer func() {
if err := imageFile.Close(); err != nil { if err := imageFile.Close(); err != nil {
cleanUpTmp()
logrus.Panic(err) logrus.Panic(err)
} }
}() }()
@ -379,6 +384,7 @@ func saveImage(imageID string) (string, string) {
for { for {
n, err := readCloser.Read(buf) n, err := readCloser.Read(buf)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
cleanUpTmp()
logrus.Panic(err) logrus.Panic(err)
} }
if n == 0 { if n == 0 {
@ -392,11 +398,13 @@ func saveImage(imageID string) (string, string) {
} }
if _, err := imageWriter.Write(buf[:n]); err != nil { if _, err := imageWriter.Write(buf[:n]); err != nil {
cleanUpTmp()
logrus.Panic(err) logrus.Panic(err)
} }
} }
if err = imageWriter.Flush(); err != nil { if err = imageWriter.Flush(); err != nil {
cleanUpTmp()
logrus.Panic(err) logrus.Panic(err)
} }