diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2020-05-28 17:00:00 +0800 |
|---|---|---|
| committer | bingoohuang <bingoo.huang@gmail.com> | 2020-05-28 17:00:00 +0800 |
| commit | 21d0a013d5912c62af43e418b613ae237f68e003 (patch) | |
| tree | 7c93b7150d5e5a2531b745cc7c17c10db5c9a513 /weed/server/volume_server_handlers_write.go | |
| parent | 41cab5d69f237d489e752e58eb7fbec59f2638fb (diff) | |
| download | seaweedfs-21d0a013d5912c62af43e418b613ae237f68e003.tar.xz seaweedfs-21d0a013d5912c62af43e418b613ae237f68e003.zip | |
rename 'needle' which collides with imported package name
Diffstat (limited to 'weed/server/volume_server_handlers_write.go')
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index 227cb0b28..9a00dcc29 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/weed/server/volume_server_handlers_write.go @@ -42,18 +42,18 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { return } - needle, originalSize, ne := needle.CreateNeedleFromRequest(r, vs.FixJpgOrientation, vs.fileSizeLimitBytes) + reqNeedle, originalSize, ne := needle.CreateNeedleFromRequest(r, vs.FixJpgOrientation, vs.fileSizeLimitBytes) if ne != nil { writeJsonError(w, r, http.StatusBadRequest, ne) return } ret := operation.UploadResult{} - isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster(), vs.store, volumeId, needle, r) + isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster(), vs.store, volumeId, reqNeedle, r) // http 204 status code does not allow body if writeError == nil && isUnchanged { - setEtag(w, needle.Etag()) + setEtag(w, reqNeedle.Etag()) w.WriteHeader(http.StatusNoContent) return } @@ -63,12 +63,12 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { httpStatus = http.StatusInternalServerError ret.Error = writeError.Error() } - if needle.HasName() { - ret.Name = string(needle.Name) + if reqNeedle.HasName() { + ret.Name = string(reqNeedle.Name) } ret.Size = uint32(originalSize) - ret.ETag = needle.Etag() - ret.Mime = string(needle.Mime) + ret.ETag = reqNeedle.Etag() + ret.Mime = string(reqNeedle.Mime) setEtag(w, ret.ETag) writeJsonQuiet(w, r, httpStatus, ret) } |
