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/graceful/net_unix.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/graceful/net_unix.go')
| -rw-r--r-- | modules/graceful/net_unix.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/graceful/net_unix.go b/modules/graceful/net_unix.go index 1e496e9d91..2dc714955e 100644 --- a/modules/graceful/net_unix.go +++ b/modules/graceful/net_unix.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" ) const ( @@ -173,7 +174,7 @@ func GetListenerUnix(network string, address *net.UnixAddr) (*net.UnixListener, } // make a fresh listener - if err := os.Remove(address.Name); err != nil && !os.IsNotExist(err) { + if err := util.Remove(address.Name); err != nil && !os.IsNotExist(err) { return nil, fmt.Errorf("Failed to remove unix socket %s: %v", address.Name, err) } |