aboutsummaryrefslogtreecommitdiff
path: root/weed-fs
diff options
context:
space:
mode:
authorchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2012-06-30 09:14:51 +0000
committerchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2012-06-30 09:14:51 +0000
commitde6e1442d7ae1266bdd29a099376fe255cd35eda (patch)
tree67c80da87a704640b8e1c6f7a7f78b931b2215f2 /weed-fs
parent8aba24a3f80fd5fbffaea8d74b168b5a07d12f38 (diff)
downloadseaweedfs-de6e1442d7ae1266bdd29a099376fe255cd35eda.tar.xz
seaweedfs-de6e1442d7ae1266bdd29a099376fe255cd35eda.zip
also return publicUrl when assigning the fid
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@48 282b0af5-e82d-9cf1-ede4-77906d7719d0
Diffstat (limited to 'weed-fs')
-rw-r--r--weed-fs/src/cmd/weedmaster/weedmaster.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed-fs/src/cmd/weedmaster/weedmaster.go b/weed-fs/src/cmd/weedmaster/weedmaster.go
index bf548f5ba..15f46197f 100644
--- a/weed-fs/src/cmd/weedmaster/weedmaster.go
+++ b/weed-fs/src/cmd/weedmaster/weedmaster.go
@@ -39,7 +39,7 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) {
func dirAssignHandler(w http.ResponseWriter, r *http.Request) {
fid, machine, err := mapper.PickForWrite()
if err == nil {
- writeJson(w, r, map[string]string{"fid": fid, "url": machine.Url})
+ writeJson(w, r, map[string]string{"fid": fid, "url": machine.Url, "publicUrl":machine.PublicUrl})
} else {
log.Println(err)
writeJson(w, r, map[string]string{"error": err.Error()})