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

setting http status code for failed requests

Browse Source
This commit is contained in:
Chris Lu 2012-10-09 21:03:22 -07:00
parent 6b1e60582c
commit 8c2c5986c8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
weed-fs/src/cmd/weed/master.go
View File

@ -58,6 +58,7 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) {
} }
writeJson(w, r, map[string]interface{}{"locations": ret}) writeJson(w, r, map[string]interface{}{"locations": ret})
} else { } else {
w.WriteHeader(http.StatusNotFound)
writeJson(w, r, map[string]string{"error": "volume id " + volumeId.String() + " not found. "}) writeJson(w, r, map[string]string{"error": "volume id " + volumeId.String() + " not found. "})
} }
} }
@ -74,11 +75,13 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) {
} }
rt, err := storage.NewReplicationTypeFromString(repType) rt, err := storage.NewReplicationTypeFromString(repType)
if err != nil { if err != nil {
w.WriteHeader(http.StatusNotAcceptable)
writeJson(w, r, map[string]string{"error": err.Error()}) writeJson(w, r, map[string]string{"error": err.Error()})
return return
} }
if topo.GetVolumeLayout(rt).GetActiveVolumeCount() <= 0 { if topo.GetVolumeLayout(rt).GetActiveVolumeCount() <= 0 {
if topo.FreeSpace() <= 0 { if topo.FreeSpace() <= 0 {
w.WriteHeader(http.StatusNotFound)
writeJson(w, r, map[string]string{"error": "No free volumes left!"}) writeJson(w, r, map[string]string{"error": "No free volumes left!"})
return return
} else { } else {
@ -89,6 +92,7 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) {
if err == nil { if err == nil {
writeJson(w, r, map[string]interface{}{"fid": fid, "url": dn.Url(), "publicUrl": dn.PublicUrl, "count": count}) writeJson(w, r, map[string]interface{}{"fid": fid, "url": dn.Url(), "publicUrl": dn.PublicUrl, "count": count})
} else { } else {
w.WriteHeader(http.StatusNotFound)
writeJson(w, r, map[string]string{"error": err.Error()}) writeJson(w, r, map[string]string{"error": err.Error()})
} }
} }
@ -130,6 +134,7 @@ func volumeGrowHandler(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
writeJson(w, r, map[string]string{"error": err.Error()}) writeJson(w, r, map[string]string{"error": err.Error()})
} else { } else {
w.WriteHeader(http.StatusNotAcceptable)
writeJson(w, r, map[string]interface{}{"count": count}) writeJson(w, r, map[string]interface{}{"count": count})
} }
} }