diff options
| author | zeripath <art27@cantab.net> | 2020-08-11 21:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 21:05:34 +0100 |
| commit | 74bd9691c685942798f2761607731697498ceeae (patch) | |
| tree | 531d661263b839ccf8aa6af73bfb6710984f0dd9 /modules/log/file.go | |
| parent | faa676cc8b4419ac56fbf9d009ea8c6b79834024 (diff) | |
| download | gitea-74bd9691c685942798f2761607731697498ceeae.tar.gz gitea-74bd9691c685942798f2761607731697498ceeae.zip | |
Re-attempt to delete temporary upload if the file is locked by another process (#12447)
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.
Fix #12339
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'modules/log/file.go')
| -rw-r--r-- | modules/log/file.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/log/file.go b/modules/log/file.go index 925d83f2b7..c9b5d47c0b 100644 --- a/modules/log/file.go +++ b/modules/log/file.go @@ -15,6 +15,8 @@ import ( "strings" "sync" "time" + + "code.gitea.io/gitea/modules/util" ) // FileLogger implements LoggerProvider. @@ -214,11 +216,11 @@ func compressOldLogFile(fname string, compressionLevel int) error { if err != nil { zw.Close() fw.Close() - os.Remove(fname + ".gz") + util.Remove(fname + ".gz") return err } reader.Close() - return os.Remove(fname) + return util.Remove(fname) } func (log *FileLogger) deleteOldLog() { @@ -233,7 +235,7 @@ func (log *FileLogger) deleteOldLog() { if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*log.Maxdays) { if strings.HasPrefix(filepath.Base(path), filepath.Base(log.Filename)) { - if err := os.Remove(path); err != nil { + if err := util.Remove(path); err != nil { returnErr = fmt.Errorf("Failed to remove %s: %v", path, err) } } |