davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-17 14:00:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix delete repo will hang on postgres (#1044)

Browse source
This commit is contained in:
Lunny Xiao 2017-02-24 23:19:13 +08:00 • committed by GitHub
parent 0602a44b27
commit c0ea3963be
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
models/repo.go
View file

@ -412,13 +412,18 @@ func (repo *Repository) ComposeMetas() map[string]string {
}
// DeleteWiki removes the actual and local copy of repository wiki.
func (repo *Repository) DeleteWiki() {
func (repo *Repository) DeleteWiki() error {
return repo.deleteWiki(x)
}
func (repo *Repository) deleteWiki(e Engine) error {
wikiPaths := []string{repo.WikiPath(), repo.LocalWikiPath()}
for _, wikiPath := range wikiPaths {
RemoveAllWithNotice("Delete repository wiki", wikiPath)
removeAllWithNotice(e, "Delete repository wiki", wikiPath)
}
x.Where("repo_id = ?", repo.ID).And("type = ?", UnitTypeWiki).Delete(new(RepoUnit))
_, err := e.Where("repo_id = ?", repo.ID).And("type = ?", UnitTypeWiki).Delete(new(RepoUnit))
return err
}
func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) {
@ -1620,27 +1625,25 @@ func DeleteRepository(uid, repoID int64) error {
return err
}
// Remove repository files.
// FIXME: Remove repository files should be executed after transaction succeed.
repoPath := repo.repoPath(sess)
RemoveAllWithNotice("Delete repository files", repoPath)
removeAllWithNotice(sess, "Delete repository files", repoPath)
repo.DeleteWiki()
repo.deleteWiki(sess)
// Remove attachment files.
for i := range attachmentPaths {
RemoveAllWithNotice("Delete attachment", attachmentPaths[i])
removeAllWithNotice(sess, "Delete attachment", attachmentPaths[i])
}
// Remove LFS objects
var lfsObjects []*LFSMetaObject
if err = sess.Where("repository_id=?", repoID).Find(&lfsObjects); err != nil {
return err
}
for _, v := range lfsObjects {
count, err := sess.Count(&LFSMetaObject{Oid: v.Oid})
if err != nil {
return err
}