diff options
| author | Chris Lu <chris.lu@gmail.com> | 2012-08-23 22:56:14 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2012-08-23 22:56:14 -0700 |
| commit | 9f92f2779dac7c3456ca16958ea6fc05a24924e1 (patch) | |
| tree | 3db8f575286111fa2e323f83c896c180327a4682 /weed-fs/src/cmd | |
| parent | 5e3ecc1b82dd08442fa3d9e52d15e68c82e8add6 (diff) | |
| download | seaweedfs-9f92f2779dac7c3456ca16958ea6fc05a24924e1.tar.xz seaweedfs-9f92f2779dac7c3456ca16958ea6fc05a24924e1.zip | |
adjusting for types
Diffstat (limited to 'weed-fs/src/cmd')
| -rw-r--r-- | weed-fs/src/cmd/weed/master.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed-fs/src/cmd/weed/master.go b/weed-fs/src/cmd/weed/master.go index 6dc3b06b9..37d3b2295 100644 --- a/weed-fs/src/cmd/weed/master.go +++ b/weed-fs/src/cmd/weed/master.go @@ -5,7 +5,7 @@ import ( "encoding/json" "log" "net/http" - "pkg/topology" + "pkg/storage" "strconv" "strings" ) @@ -39,7 +39,7 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) { vid = vid[0:commaSep] } volumeId, _ := strconv.ParseUint(vid, 10, 64) - machine, e := mapper.Get(topology.VolumeId(volumeId)) + machine, e := mapper.Get(storage.VolumeId(volumeId)) if e == nil { writeJson(w, r, machine.Server) } else { @@ -60,7 +60,7 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) { func dirJoinHandler(w http.ResponseWriter, r *http.Request) { s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port") publicUrl := r.FormValue("publicUrl") - volumes := new([]topology.VolumeInfo) + volumes := new([]storage.VolumeInfo) json.Unmarshal([]byte(r.FormValue("volumes")), volumes) if *IsDebug { log.Println(s, "volumes", r.FormValue("volumes")) |
