diff options
| author | chrislusf <chris.lu@gmail.com> | 2015-02-12 08:43:26 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2015-02-12 08:43:26 -0800 |
| commit | be35ec63cb3d2c866164938b1dd063137080ff47 (patch) | |
| tree | b3b99fd651b52c2a44d56255ac1b1e286a85750f | |
| parent | eff83a87d126faf0dd5b05876690271777f41e65 (diff) | |
| parent | 7e0c080581ba48547f1746518a8b101e705b7c62 (diff) | |
| download | seaweedfs-be35ec63cb3d2c866164938b1dd063137080ff47.tar.xz seaweedfs-be35ec63cb3d2c866164938b1dd063137080ff47.zip | |
Merge pull request #84 from EPICPaaS/master
Move the redirect url prefer to volume server's PublicUrl
| -rw-r--r-- | go/weed/weed_server/master_server_handlers_admin.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 9d9880a6a..62605f331 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -122,7 +122,11 @@ func (ms *MasterServer) redirectHandler(w http.ResponseWriter, r *http.Request) } machines := ms.Topo.Lookup("", volumeId) if machines != nil && len(machines) > 0 { - http.Redirect(w, r, "http://"+machines[0].Url()+r.URL.Path, http.StatusMovedPermanently) + url := machines[0].PublicUrl + if url == "" { + url = machines[0].Url() + } + http.Redirect(w, r, "http://"+url+r.URL.Path, http.StatusMovedPermanently) } else { writeJsonError(w, r, http.StatusNotFound, fmt.Errorf("volume id %d not found.", volumeId)) } |