Browse Source

fix master static resource display problem

pull/753/head
Chris Lu 6 years ago
parent
commit
4af6b4eb0e
  1. 6
      weed/server/common.go
  2. 1
      weed/server/master_server.go

6
weed/server/common.go

@ -20,6 +20,7 @@ import (
_ "github.com/chrislusf/seaweedfs/weed/statik"
statik "github.com/rakyll/statik/fs"
"github.com/gorilla/mux"
)
var serverStats *stats.ServerStats
@ -198,3 +199,8 @@ func handleStaticResources(defaultMux *http.ServeMux) {
defaultMux.Handle("/favicon.ico", 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

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

Loading…
Cancel
Save