aboutsummaryrefslogtreecommitdiff
path: root/weed-fs/src/cmd
diff options
context:
space:
mode:
authorchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2011-12-19 05:59:37 +0000
committerchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2011-12-19 05:59:37 +0000
commitb39d1a77b41a4a7ae4ef90e014a4920b0412ee9f (patch)
treeb106747ea3e2f150fb6ffde68cdc4031a3aae6d1 /weed-fs/src/cmd
parent041a93887c442508d456611fdfc428066f5198a9 (diff)
downloadseaweedfs-b39d1a77b41a4a7ae4ef90e014a4920b0412ee9f.tar.xz
seaweedfs-b39d1a77b41a4a7ae4ef90e014a4920b0412ee9f.zip
cleaner
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@16 282b0af5-e82d-9cf1-ede4-77906d7719d0
Diffstat (limited to 'weed-fs/src/cmd')
-rw-r--r--weed-fs/src/cmd/weeds.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/weed-fs/src/cmd/weeds.go b/weed-fs/src/cmd/weeds.go
index ba134380c..4b3792687 100644
--- a/weed-fs/src/cmd/weeds.go
+++ b/weed-fs/src/cmd/weeds.go
@@ -22,11 +22,15 @@ var (
func dirReadHandler(w http.ResponseWriter, r *http.Request) {
volumeId, _ := strconv.Atoui64(r.FormValue("volumeId"))
machine := mapper.Get(volumeId)
- writeJson(w, r, machine)
+ writeJson(w, r, machine.Server)
}
func dirWriteHandler(w http.ResponseWriter, r *http.Request) {
- machineList := mapper.PickForWrite()
- writeJson(w, r, machineList)
+ machine := mapper.PickForWrite()
+ writeJson(w, r, machine)
+}
+func dirPickHandler(w http.ResponseWriter, r *http.Request) {
+ machine := mapper.PickForWrite()
+ writeJson(w, r, machine)
}
func dirJoinHandler(w http.ResponseWriter, r *http.Request) {
s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port")
@@ -64,6 +68,7 @@ func main() {
defer mapper.Save()
http.HandleFunc("/dir/read", dirReadHandler)
http.HandleFunc("/dir/write", dirWriteHandler)
+ http.HandleFunc("/dir/pick", dirPickHandler)
http.HandleFunc("/dir/join", dirJoinHandler)
http.HandleFunc("/dir/status", dirStatusHandler)