mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error on existing avatar partition

Browse Source
This commit is contained in:
Umputun
2018-02-14 14:26:57 -06:00
parent 844c17dc8f
commit d35b07a791
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/rest/avatar/avatar.go
+10 -7
View File
@@ -48,8 +48,9 @@ func (p *Proxy) Put(u store.User) (avatarURL string, err error) {
return "", errors.Wrapf(err, "failed to get avatar for user %s from %s", u.ID, u.Picture)
}
defer func() {
e := resp.Body.Close()
log.Printf("[WARN] can't close response body, %s", e)
if e := resp.Body.Close(); e != nil {
log.Printf("[WARN] can't close response body, %s", e)
}
}()
pngWr := &bytes.Buffer{}
@@ -58,7 +59,7 @@ func (p *Proxy) Put(u store.User) (avatarURL string, err error) {
}
location := p.location(u.ID)
if err = os.Mkdir(location, 0600); err != nil {
if err = os.Mkdir(location, 0600); err != nil && !strings.Contains(err.Error(), "file exists") {
return "", errors.Wrapf(err, "failed to make avatar location %s", location)
}
@@ -68,8 +69,9 @@ func (p *Proxy) Put(u store.User) (avatarURL string, err error) {
return "", errors.Wrapf(err, "can't create file %s", avFile)
}
defer func() {
e := fh.Close()
log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
if e := fh.Close(); e != nil {
log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
}
}()
if _, err = io.Copy(fh, pngWr); err != nil {
@@ -92,8 +94,9 @@ func (p *Proxy) Routes() chi.Router {
}
defer func() {
e := fh.Close()
log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
if e := fh.Close(); e != nil {
log.Printf("[WARN] can't close avatar file %s, %s", avFile, e)
}
}()
w.Header().Set("Content-Type", "image/png")