lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-15 04:04:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid sharing same err variable

Browse Source
This commit is contained in:
Chris Lu
2014-03-12 15:17:23 -07:00
parent 097aac2328
commit 7a8bc2e19e
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
go/operation/upload_content.go
View File

@@ -53,35 +53,35 @@ func upload_content(uploadUrl string, fillBufferFunction func(w io.Writer) error
if isGzipped { if isGzipped {
h.Set("Content-Encoding", "gzip") h.Set("Content-Encoding", "gzip")
} }
file_writer, err := body_writer.CreatePart(h) file_writer, cp_err := body_writer.CreatePart(h)
if err != nil { if cp_err != nil {
glog.V(0).Infoln("error creating form file", err) glog.V(0).Infoln("error creating form file", cp_err.Error())
return nil, err return nil, cp_err
} }
if err = fillBufferFunction(file_writer); err != nil { if err := fillBufferFunction(file_writer); err != nil {
glog.V(0).Infoln("error copying data", err) glog.V(0).Infoln("error copying data", err)
return nil, err return nil, err
} }
content_type := body_writer.FormDataContentType() content_type := body_writer.FormDataContentType()
if err = body_writer.Close(); err != nil { if err := body_writer.Close(); err != nil {
glog.V(0).Infoln("error closing body", err) glog.V(0).Infoln("error closing body", err)
return nil, err return nil, err
} }
resp, err := client.Post(uploadUrl, content_type, body_buf) resp, post_err := client.Post(uploadUrl, content_type, body_buf)
if err != nil { if post_err != nil {
glog.V(0).Infoln("failing to upload to", uploadUrl, err.Error()) glog.V(0).Infoln("failing to upload to", uploadUrl, post_err.Error())
return nil, err return nil, post_err
} }
defer resp.Body.Close() defer resp.Body.Close()
resp_body, err := ioutil.ReadAll(resp.Body) resp_body, ra_err := ioutil.ReadAll(resp.Body)
if err != nil { if ra_err != nil {
return nil, err return nil, ra_err
} }
var ret UploadResult var ret UploadResult
err = json.Unmarshal(resp_body, &ret) unmarshal_err := json.Unmarshal(resp_body, &ret)
if err != nil { if unmarshal_err != nil {
glog.V(0).Infoln("failing to read upload resonse", uploadUrl, string(resp_body)) glog.V(0).Infoln("failing to read upload resonse", uploadUrl, string(resp_body))
return nil, err return nil, unmarshal_err
} }
if ret.Error != "" { if ret.Error != "" {
return nil, errors.New(ret.Error) return nil, errors.New(ret.Error)