ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-29 00:59:39 +09:00
Code Issues Projects Releases Wiki Activity

refactor: retry file remove/rename when a file is busy and clean up os detection (#38588)

Browse Source 
Rename functions "util.Remove" (remove.go) to "util.RemoveWithRetry"
(file_retry.go) and add comments to clarify their behaviors, also add
tests.

Refactor callers: when no concurrent access (cmd cli, migration, app
init, test), use "os.Xxx" directly.

More details are in `modules/util/file_retry.go`

By the way, clean up OS (windows) detection, make FileURLToPath test
always run
This commit is contained in:
wxiaoguang
2026-07-23 14:31:29 +00:00
committed by GitHub
parent c4fc4d363b
commit e992b0a7cc
32 changed files with 225 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/asymkey/ssh_key_authorized_keys.go
+4 -4
View File
@@ -50,8 +50,8 @@ func rewriteAllPublicKeys(ctx context.Context) error {
return err
}
defer func() {
t.Close()
if err := util.Remove(tmpPath); err != nil {
_ = t.Close()
if err := util.RemoveWithRetry(tmpPath); err != nil {
log.Warn("Unable to remove temporary authorized keys file: %s: Error: %v", tmpPath, err)
}
}()
@@ -74,6 +74,6 @@ func rewriteAllPublicKeys(ctx context.Context) error {
return err
}
t.Close()
return util.Rename(tmpPath, fPath)
_ = t.Close()
return util.RenameWithRetry(tmpPath, fPath)
}
services/asymkey/ssh_key_authorized_principals.go
+4 -4
View File
@@ -61,8 +61,8 @@ func rewriteAllPrincipalKeys(ctx context.Context) error {
return err
}
defer func() {
t.Close()
os.Remove(tmpPath)
_ = t.Close()
_ = util.RemoveWithRetry(tmpPath)
}()
if setting.SSH.AuthorizedPrincipalsBackup {
@@ -83,8 +83,8 @@ func rewriteAllPrincipalKeys(ctx context.Context) error {
return err
}
t.Close()
return util.Rename(tmpPath, fPath)
_ = t.Close()
return util.RenameWithRetry(tmpPath, fPath)
}
func regeneratePrincipalKeys(ctx context.Context, t io.Writer) error {