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

1. root dir has id of 0

Browse Source 
2. only delete empty folders
3. correct listing files under a folder
This commit is contained in:
Chris Lu
2014-04-09 21:01:48 -07:00
parent abde40377c
commit 5f4dc11409
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/weed/weed_server/filer_server.go
View File

@@ -22,7 +22,7 @@ func NewFilerServer(r *http.ServeMux, port int, master string, dir string, colle
}
if fs.filer, err = filer.NewFilerEmbedded(dir); err != nil {
glog.Fatal("Can not start filer in dir:", dir)
glog.Fatal("Can not start filer in dir", dir, ": ", err.Error())
return
}

10
go/weed/weed_server/filer_server_handlers.go
View File

@@ -43,12 +43,12 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque
m := make(map[string]interface{})
m["Directory"] = r.URL.Path
m["Subdirectories"] = dirlist
lastFile := r.FormValue("lastFile")
lastFileName := r.FormValue("lastFileName")
limit, limit_err := strconv.Atoi(r.FormValue("limit"))
if limit_err != nil {
limit = 100
}
m["Files"], _ = fs.filer.ListFiles(r.URL.Path, lastFile, limit)
m["Files"], _ = fs.filer.ListFiles(r.URL.Path, lastFileName, limit)
writeJsonQuiet(w, r, m)
}
func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) {
@@ -190,10 +190,12 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
err = operation.DeleteFile(fs.master, fid)
}
}
if err != nil {
glog.V(1).Infoln("deleting", r.URL.Path, ":", err.Error())
if err == nil {
w.WriteHeader(http.StatusAccepted)
writeJsonQuiet(w, r, map[string]string{"error": ""})
} else {
glog.V(4).Infoln("deleting", r.URL.Path, ":", err.Error())
w.WriteHeader(http.StatusInternalServerError)
writeJsonError(w, r, err)
}
}