From cf59057ef3e91735592a3067ba803c9223a64caa Mon Sep 17 00:00:00 2001 From: Vitaliy Vasilenko Date: Tue, 20 Jan 2015 05:20:33 +0200 Subject: [PATCH] fix if service.ENABLE_CACHE_AVATAR is true --- modules/avatar/avatar.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)