From 7e0c080581ba48547f1746518a8b101e705b7c62 Mon Sep 17 00:00:00 2001 From: yourchanges Date: Thu, 12 Feb 2015 18:46:56 +0800 Subject: [PATCH] Move the redirect url perfer to volume server's PublicUrl --- go/weed/weed_server/master_server_handlers_admin.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)) }