mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-27 20:59:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

add error handling when non-multipart request comes in

Browse Source 
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@49 282b0af5-e82d-9cf1-ede4-77906d7719d0
This commit is contained in:
chris.lu@gmail.com 2012-07-03 06:46:26 +00:00
parent de6e1442d7
commit 74989d69c9
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
weed-fs/src/cmd/weedvolume/weedvolume.go
View File

@ -72,10 +72,15 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
if e != nil { if e != nil {
writeJson(w, r, e) writeJson(w, r, e)
} else { } else {
ret := store.Write(volumeId, storage.NewNeedle(r)) needle, ne := storage.NewNeedle(r)
m := make(map[string]uint32) if ne!=nil{
m["size"] = ret writeJson(w, r, ne)
writeJson(w, r, m) }else{
ret := store.Write(volumeId, needle)
m := make(map[string]uint32)
m["size"] = ret
writeJson(w, r, m)
}
} }
} }
func DeleteHandler(w http.ResponseWriter, r *http.Request) { func DeleteHandler(w http.ResponseWriter, r *http.Request) {

6
weed-fs/src/pkg/storage/needle.go
View File

@ -20,12 +20,14 @@ type Needle struct {
Padding []byte "Aligned to 8 bytes" Padding []byte "Aligned to 8 bytes"
} }
func NewNeedle(r *http.Request) (n *Needle) { func NewNeedle(r *http.Request) (n *Needle, e error) {
n = new(Needle) n = new(Needle)
form, fe := r.MultipartReader() form, fe := r.MultipartReader()
if fe != nil { if fe != nil {
log.Fatalf("MultipartReader [ERROR] %s\n", fe) log.Printf("MultipartReader [ERROR] %s\n", fe)
e = fe
return
} }
part, _ := form.NextPart() part, _ := form.NextPart()
data, _ := ioutil.ReadAll(part) data, _ := ioutil.ReadAll(part)