dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: clean temporary file when backsource error (#2575) 

Signed-off-by: Jim Ma <majinjing3@gmail.com>
This commit is contained in:
Jim Ma 2023-07-28 14:44:53 +08:00 committed by GitHub
parent d2aaa0835f
commit 3044b867bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/dfget/dfget.go
View File

@ -143,20 +143,30 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
var ( var (
wLog = logger.With("url", cfg.URL) wLog = logger.With("url", cfg.URL)
start = time.Now() start = time.Now()
target *os.File tempFile *os.File
response *source.Response response *source.Response
err error err error
written int64 written int64
renameOK bool
) )
wLog.Info("try to download from source and ignore rate limit") wLog.Info("try to download from source and ignore rate limit")
fmt.Println("try to download from source and ignore rate limit") fmt.Println("try to download from source and ignore rate limit")
if target, err = os.CreateTemp(filepath.Dir(cfg.Output), ".df_"); err != nil { if tempFile, err = os.CreateTemp(filepath.Dir(cfg.Output), ".df_"); err != nil {
return err return err
} }
defer os.Remove(target.Name()) defer func() {
defer target.Close() if !renameOK {
tempPath := path.Join(filepath.Dir(cfg.Output), tempFile.Name())
removeErr := os.Remove(tempPath)
if removeErr != nil {
wLog.Infof("remove temporary file %s error: %s", tempPath, removeErr)
fmt.Printf("remove temporary file %s error: %s\n", tempPath, removeErr)
}
}
tempFile.Close()
}()
downloadRequest, err := source.NewRequestWithContext(ctx, cfg.URL, hdr) downloadRequest, err := source.NewRequestWithContext(ctx, cfg.URL, hdr)
if err != nil { if err != nil {
@ -170,7 +180,7 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
return err return err
} }
if written, err = io.Copy(target, response.Body); err != nil { if written, err = io.Copy(tempFile, response.Body); err != nil {
return err return err
} }
@ -180,7 +190,7 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
return err return err
} }
encoded, err := digest.HashFile(target.Name(), d.Algorithm) encoded, err := digest.HashFile(tempFile.Name(), d.Algorithm)
if err != nil { if err != nil {
return err return err
} }
@ -191,13 +201,14 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
} }
// change file owner // change file owner
if err = os.Chown(target.Name(), os.Getuid(), os.Getgid()); err != nil { if err = os.Chown(tempFile.Name(), os.Getuid(), os.Getgid()); err != nil {
return fmt.Errorf("change file owner to uid[%d] gid[%d]: %w", os.Getuid(), os.Getgid(), err) return fmt.Errorf("change file owner to uid[%d] gid[%d]: %w", os.Getuid(), os.Getgid(), err)
} }
if err = os.Rename(target.Name(), cfg.Output); err != nil { if err = os.Rename(tempFile.Name(), cfg.Output); err != nil {
return err return err
} }
renameOK = true
wLog.Infof("download from source success, length: %d bytes cost: %d ms", written, time.Since(start).Milliseconds()) wLog.Infof("download from source success, length: %d bytes cost: %d ms", written, time.Since(start).Milliseconds())
fmt.Printf("finish total length %d bytes\n", written) fmt.Printf("finish total length %d bytes\n", written)