realaravinth/bench-forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix if service.ENABLE_CACHE_AVATAR is true

Browse source
This commit is contained in:
Vitaliy Vasilenko 2015-01-20 05:20:33 +02:00
parent 0e286a0ca9
commit cf59057ef3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/avatar/avatar.go
View file

@ -38,10 +38,12 @@ import (
var gravatarSource string var gravatarSource string
func init() { func UpdateGravatarSource() {
gravatarSource = setting.GravatarSource gravatarSource = setting.GravatarSource
log.Debug("avatar.UpdateGravatarSource(gavatar source): %s", gravatarSource)
if !strings.HasPrefix(gravatarSource, "http:") { if !strings.HasPrefix(gravatarSource, "http:") {
gravatarSource = "http:" + gravatarSource gravatarSource = "http:" + gravatarSource
log.Debug("avatar.UpdateGravatarSource(update gavatar source): %s", gravatarSource)
} }
} }
@ -131,11 +133,13 @@ func (this *Avatar) Encode(wr io.Writer, size int) (err error) {
// get image from gravatar.com // get image from gravatar.com
func (this *Avatar) Update() { func (this *Avatar) Update() {
UpdateGravatarSource()
thunder.Fetch(gravatarSource+this.Hash+"?"+this.reqParams, thunder.Fetch(gravatarSource+this.Hash+"?"+this.reqParams,
this.imagePath) this.imagePath)
} }
func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) { func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) {
UpdateGravatarSource()
select { select {
case <-time.After(timeout): case <-time.After(timeout):
err = fmt.Errorf("get gravatar image %s timeout", this.Hash) err = fmt.Errorf("get gravatar image %s timeout", this.Hash)