diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-10-12 00:05:15 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-10-12 00:05:15 -0700 |
| commit | 4af6b4eb0eb9f43afb49a3dbe4131e049538755f (patch) | |
| tree | 0f83b736c1de01ec4888227243cc34bf653a0d17 | |
| parent | 556382ff5f830d0a74846bfbf74008671a4b4b08 (diff) | |
| download | seaweedfs-4af6b4eb0eb9f43afb49a3dbe4131e049538755f.tar.xz seaweedfs-4af6b4eb0eb9f43afb49a3dbe4131e049538755f.zip | |
fix master static resource display problem
| -rw-r--r-- | weed/server/common.go | 6 | ||||
| -rw-r--r-- | weed/server/master_server.go | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 215ee1036..9b9ed7659 100644 --- a/weed/server/common.go +++ b/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))) +} diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 07a398ead..a0d7e9605 100644 --- a/weed/server/master_server.go +++ b/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))) |
