diff options
| author | Vitaliy Vasilenko <vvitalvas@yandex.ru> | 2015-01-20 05:20:33 +0200 |
|---|---|---|
| committer | Vitaliy Vasilenko <vvitalvas@yandex.ru> | 2015-01-20 05:20:33 +0200 |
| commit | cf59057ef3e91735592a3067ba803c9223a64caa (patch) | |
| tree | 562931e3f24775fb7e1c8a386702456b8bf40740 /modules/avatar/avatar.go | |
| parent | 0e286a0ca96ff32241b0d96515d57a37c8a3d5dc (diff) | |
| download | gitea-cf59057ef3e91735592a3067ba803c9223a64caa.tar.gz gitea-cf59057ef3e91735592a3067ba803c9223a64caa.zip | |
fix if service.ENABLE_CACHE_AVATAR is true
Diffstat (limited to 'modules/avatar/avatar.go')
| -rw-r--r-- | modules/avatar/avatar.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go index c0a71f11de..73daa213c9 100644 --- a/modules/avatar/avatar.go +++ b/modules/avatar/avatar.go @@ -38,10 +38,12 @@ import ( var gravatarSource string -func init() { +func UpdateGravatarSource() { gravatarSource = setting.GravatarSource + log.Debug("avatar.UpdateGravatarSource(gavatar source): %s", gravatarSource) if !strings.HasPrefix(gravatarSource, "http:") { 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 func (this *Avatar) Update() { + UpdateGravatarSource() thunder.Fetch(gravatarSource+this.Hash+"?"+this.reqParams, this.imagePath) } func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) { + UpdateGravatarSource() select { case <-time.After(timeout): err = fmt.Errorf("get gravatar image %s timeout", this.Hash) |