diff options
| author | Chris Lu <chris.lu@uber.com> | 2019-03-25 21:19:34 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@uber.com> | 2019-03-25 21:19:34 -0700 |
| commit | c913583e2d8de645c5dc36bd048d8e6e51f71ed2 (patch) | |
| tree | 1151fd9621cb87f112e1816405a4e78abc8f8481 /weed/server | |
| parent | 70815e91249f481b71ca1fbca14ff41430e42681 (diff) | |
| parent | 91b9a684933138b21b9453b5cdc5ab97f54ed85d (diff) | |
| download | seaweedfs-c913583e2d8de645c5dc36bd048d8e6e51f71ed2.tar.xz seaweedfs-c913583e2d8de645c5dc36bd048d8e6e51f71ed2.zip | |
Merge branch 'master' into add_volume_follow
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_server.go | 2 | ||||
| -rw-r--r-- | weed/server/master_ui/templates.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index a70de5e6e..ef32809b0 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -79,7 +79,7 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string, if !disableHttp { handleStaticResources2(r) - r.HandleFunc("/", ms.uiStatusHandler) + r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) r.HandleFunc("/ui/index.html", ms.uiStatusHandler) r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler))) r.HandleFunc("/dir/lookup", ms.proxyToLeader(ms.guard.WhiteList(ms.dirLookupHandler))) diff --git a/weed/server/master_ui/templates.go b/weed/server/master_ui/templates.go index ce632b099..ceb0528cf 100644 --- a/weed/server/master_ui/templates.go +++ b/weed/server/master_ui/templates.go @@ -41,7 +41,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html> <td class="col-sm-2 field-label"><label>Other Masters:</label></td> <td class="col-sm-10"><ul class="list-unstyled"> {{ range $k, $p := .Peers }} - <li><a href="http://{{ $p.Name }}">{{ $p.Name }}</a></li> + <li><a href="http://{{ $p.Name }}/ui/index.html">{{ $p.Name }}</a></li> {{ end }} </ul></td> </tr> |