From 844c17dc8f549052ad05ea836d7accf83383436f Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Wed, 14 Feb 2018 14:18:45 -0600
Subject: [PATCH] lint: multiple avatar warns

---
 app/rest/avatar/avatar.go | 24 +++++++++++++++++++-----
 app/rest/server.go        |  6 +++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/rest/avatar/avatar.go b/app/rest/avatar/avatar.go
index 377f255d..62b5424c 100644
--- a/app/rest/avatar/avatar.go
+++ b/app/rest/avatar/avatar.go
@@ -1,6 +1,5 @@
 // Package avatar provides cached proxy for user pictures/avatars
 // refreshed by login and kept in local store
-
 package avatar
 
 import (
@@ -48,7 +47,10 @@ func (p *Proxy) Put(u store.User) (avatarURL string, err error) {
 	if err != nil {
 		return "", errors.Wrapf(err, "failed to get avatar for user %s from %s", u.ID, u.Picture)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		e := resp.Body.Close()
+		log.Printf("[WARN] can't close response body, %s", e)
+	}()
 
 	pngWr := &bytes.Buffer{}
 	if err = p.convertToPng(resp.Body, pngWr); err != nil {
@@ -56,13 +58,20 @@ func (p *Proxy) Put(u store.User) (avatarURL string, err error) {
 	}
 
 	location := p.location(u.ID)
-	os.Mkdir(location, 0700)
+	if err = os.Mkdir(location, 0600); err != nil {
+		return "", errors.Wrapf(err, "failed to make avatar location %s", location)
+	}
+
 	avFile := path.Join(location, u.ID+".png")
 	fh, err := os.Create(avFile)
 	if err != nil {
 		return "", errors.Wrapf(err, "can't create file %s", avFile)
 	}
-	defer fh.Close()
+	defer func() {
+		e := fh.Close()
+		log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
+	}()
+
 	if _, err = io.Copy(fh, pngWr); err != nil {
 		return "", errors.Wrapf(err, "can't save file %s", avFile)
 	}
@@ -81,7 +90,12 @@ func (p *Proxy) Routes() chi.Router {
 			common.SendErrorJSON(w, r, http.StatusBadRequest, err, "can't load avatar")
 			return
 		}
-		defer fh.Close()
+
+		defer func() {
+			e := fh.Close()
+			log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
+		}()
+
 		w.Header().Set("Content-Type", "image/png")
 		if status, ok := r.Context().Value(render.StatusCtxKey).(int); ok {
 			w.WriteHeader(status)
diff --git a/app/rest/server.go b/app/rest/server.go
index 8620358f..bf9b8ed0 100644
--- a/app/rest/server.go
+++ b/app/rest/server.go
@@ -153,10 +153,10 @@ func (s *Server) createCommentCtrl(w http.ResponseWriter, r *http.Request) {
 	// render markdown
 	comment.Text = string(blackfriday.Run([]byte(comment.Text), blackfriday.WithNoExtensions()))
 
-	if avatarUrl, err := s.AvatarProxy.Put(user); err == nil {
-		comment.User.Picture = avatarUrl
+	if avatarURL, e := s.AvatarProxy.Put(user); e == nil {
+		comment.User.Picture = avatarURL
 	} else {
-		log.Printf("[WARN] failed to proxy avatar, %s", err)
+		log.Printf("[WARN] failed to proxy avatar, %s", e)
 	}
 
 	log.Printf("[DEBUG] create comment %+v", comment)