aboutsummaryrefslogtreecommitdiff
path: root/go
diff options
context:
space:
mode:
authortnextday <fw2k4@163.com>2015-12-02 18:25:18 +0800
committertnextday <fw2k4@163.com>2015-12-02 18:25:18 +0800
commit520875d45504f0b659de7f4ff656634489100416 (patch)
treec3492a2ed99d5e982226d0b1a3bed2fbcf4dcde2 /go
parentd0e2475ecea97ac96ddbdc76f98a5de32e4a68ad (diff)
downloadseaweedfs-520875d45504f0b659de7f4ff656634489100416.tar.xz
seaweedfs-520875d45504f0b659de7f4ff656634489100416.zip
update
Diffstat (limited to 'go')
-rw-r--r--go/operation/submit.go2
-rw-r--r--go/weed/weed_server/volume_server_handlers_read.go10
2 files changed, 6 insertions, 6 deletions
diff --git a/go/operation/submit.go b/go/operation/submit.go
index 65f20cf55..ac5a3b55f 100644
--- a/go/operation/submit.go
+++ b/go/operation/submit.go
@@ -190,6 +190,6 @@ func upload_chunked_file_manifest(fileUrl string, manifest *ChunkManifest, jwt s
q := u.Query()
q.Set("cm", "1")
u.RawQuery = q.Encode()
- _, e = Upload(u.String(), manifest.Name, bufReader, false, "text/plain", jwt)
+ _, e = Upload(u.String(), manifest.Name, bufReader, false, "application/json", jwt)
return e
}
diff --git a/go/weed/weed_server/volume_server_handlers_read.go b/go/weed/weed_server/volume_server_handlers_read.go
index 6a7944d25..34b0720b9 100644
--- a/go/weed/weed_server/volume_server_handlers_read.go
+++ b/go/weed/weed_server/volume_server_handlers_read.go
@@ -140,7 +140,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
if rangeReq == "" {
w.Header().Set("Content-Length", strconv.Itoa(len(n.Data)))
if _, e = w.Write(n.Data); e != nil {
- glog.V(0).Infoln("response write error:", e)
+ glog.V(4).Infoln("response write error:", e)
}
return
}
@@ -181,7 +181,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
w.Header().Set("Content-Range", ra.contentRange(size))
w.WriteHeader(http.StatusPartialContent)
if _, e = w.Write(n.Data[ra.start : ra.start+ra.length]); e != nil {
- glog.V(0).Infoln("response write error:", e)
+ glog.V(4).Infoln("response write error:", e)
}
return
}
@@ -324,10 +324,10 @@ func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string,
w.Header().Set("Content-Range", ra.contentRange(size))
w.WriteHeader(http.StatusPartialContent)
if _, e = chunkedFileReader.Seek(ra.start, 0); e != nil {
- glog.V(0).Infoln("response write error:", e)
+ glog.V(0).Infoln("chunkedFileReader Seek error:", e)
}
if _, e = io.CopyN(w, chunkedFileReader, ra.length); e != nil {
- glog.V(0).Infoln("response write error:", e)
+ glog.V(4).Infoln("response write error:", e)
}
return
}
@@ -352,7 +352,7 @@ func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string,
return
}
if _, e = chunkedFileReader.Seek(ra.start, 0); e != nil {
- glog.V(0).Infoln("response write error:", e)
+ glog.V(4).Infoln("response write error:", e)
}
if _, err = io.CopyN(part, chunkedFileReader, ra.length); err != nil {
pw.CloseWithError(err)