pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Close storage objects before cleaning (#16934)

Browse source 
Storage.Iterate provides the path and an open object. On windows using
local storage means that the objects will be locked thus preventing clean
from deleting them.

This PR simply closes the objects early.

Fix #16932

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-09-03 11:48:49 +01:00 committed by GitHub
parent 6c125e9797
commit 076bb8a2a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/storage/storage.go
View file

@ -91,6 +91,7 @@ func Copy(dstStorage ObjectStorage, dstPath string, srcStorage ObjectStorage, sr
// Clean delete all the objects in this storage // Clean delete all the objects in this storage
func Clean(storage ObjectStorage) error { func Clean(storage ObjectStorage) error {
return storage.IterateObjects(func(path string, obj Object) error { return storage.IterateObjects(func(path string, obj Object) error {
_ = obj.Close()
return storage.Delete(path) return storage.Delete(path)
}) })
} }