gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into add_volume_follow

Browse Source
This commit is contained in:
Chris Lu
2019-03-25 21:19:34 -07:00
parent 70815e9124 91b9a68493
commit c913583e2d
4 changed files with 11 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/server/master_server.go
View File

@@ -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)))

2
weed/server/master_ui/templates.go
View File

@@ -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>