lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 23:17:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix master static resource display problem

Browse Source
This commit is contained in:
Chris Lu
2018-10-12 00:05:15 -07:00
parent 556382ff5f
commit 4af6b4eb0e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/server/common.go
View File

@@ -20,6 +20,7 @@ import (
_ "github.com/chrislusf/seaweedfs/weed/statik" _ "github.com/chrislusf/seaweedfs/weed/statik"
statik "github.com/rakyll/statik/fs" statik "github.com/rakyll/statik/fs"
"github.com/gorilla/mux"
) )
var serverStats *stats.ServerStats var serverStats *stats.ServerStats
@@ -198,3 +199,8 @@ func handleStaticResources(defaultMux *http.ServeMux) {
defaultMux.Handle("/favicon.ico", http.FileServer(statikFS)) defaultMux.Handle("/favicon.ico", http.FileServer(statikFS))
defaultMux.Handle("/seaweedfsstatic/", http.StripPrefix("/seaweedfsstatic", http.FileServer(statikFS))) defaultMux.Handle("/seaweedfsstatic/", http.StripPrefix("/seaweedfsstatic", http.FileServer(statikFS)))
} }
func handleStaticResources2(r *mux.Router) {
r.Handle("/favicon.ico", http.FileServer(statikFS))
r.PathPrefix("/seaweedfsstatic/").Handler(http.StripPrefix("/seaweedfsstatic", http.FileServer(statikFS)))
}

1
weed/server/master_server.go
View File

@@ -69,6 +69,7 @@ func NewMasterServer(r *mux.Router, port int, metaFolder string,
ms.guard = security.NewGuard(whiteList, secureKey) ms.guard = security.NewGuard(whiteList, secureKey)
handleStaticResources2(r)
r.HandleFunc("/", ms.uiStatusHandler) r.HandleFunc("/", ms.uiStatusHandler)
r.HandleFunc("/ui/index.html", ms.uiStatusHandler) r.HandleFunc("/ui/index.html", ms.uiStatusHandler)
r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler))) r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler)))