Skip to content

Commit 5832f8d

Browse files
lunnytechknowlogick
authored andcommitted
Fix database lock when use random repository fallback image (#7166)
* fix database lock when use random repository fallback image * remove unused function
1 parent 1608f63 commit 5832f8d

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

models/repo.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (repo *Repository) innerAPIFormat(e Engine, mode AccessMode, isParent bool)
331331
AllowRebase: allowRebase,
332332
AllowRebaseMerge: allowRebaseMerge,
333333
AllowSquash: allowSquash,
334-
AvatarURL: repo.AvatarLink(),
334+
AvatarURL: repo.avatarLink(e),
335335
}
336336
}
337337

@@ -2528,11 +2528,7 @@ func (repo *Repository) CustomAvatarPath() string {
25282528
return filepath.Join(setting.RepositoryAvatarUploadPath, repo.Avatar)
25292529
}
25302530

2531-
// GenerateRandomAvatar generates a random avatar for repository.
2532-
func (repo *Repository) GenerateRandomAvatar() error {
2533-
return repo.generateRandomAvatar(x)
2534-
}
2535-
2531+
// generateRandomAvatar generates a random avatar for repository.
25362532
func (repo *Repository) generateRandomAvatar(e Engine) error {
25372533
idToString := fmt.Sprintf("%d", repo.ID)
25382534

@@ -2585,16 +2581,19 @@ func RemoveRandomAvatars() error {
25852581

25862582
// RelAvatarLink returns a relative link to the repository's avatar.
25872583
func (repo *Repository) RelAvatarLink() string {
2584+
return repo.relAvatarLink(x)
2585+
}
25882586

2587+
func (repo *Repository) relAvatarLink(e Engine) string {
25892588
// If no avatar - path is empty
25902589
avatarPath := repo.CustomAvatarPath()
25912590
if len(avatarPath) <= 0 || !com.IsFile(avatarPath) {
25922591
switch mode := setting.RepositoryAvatarFallback; mode {
25932592
case "image":
25942593
return setting.RepositoryAvatarFallbackImage
25952594
case "random":
2596-
if err := repo.GenerateRandomAvatar(); err != nil {
2597-
log.Error("GenerateRandomAvatar: %v", err)
2595+
if err := repo.generateRandomAvatar(e); err != nil {
2596+
log.Error("generateRandomAvatar: %v", err)
25982597
}
25992598
default:
26002599
// default behaviour: do not display avatar
@@ -2604,9 +2603,9 @@ func (repo *Repository) RelAvatarLink() string {
26042603
return setting.AppSubURL + "/repo-avatars/" + repo.Avatar
26052604
}
26062605

2607-
// AvatarLink returns user avatar absolute link.
2608-
func (repo *Repository) AvatarLink() string {
2609-
link := repo.RelAvatarLink()
2606+
// avatarLink returns user avatar absolute link.
2607+
func (repo *Repository) avatarLink(e Engine) string {
2608+
link := repo.relAvatarLink(e)
26102609
// link may be empty!
26112610
if len(link) > 0 {
26122611
if link[0] == '/' && link[1] != '/' {

0 commit comments

Comments
 (0)