diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-12-14 00:32:17 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-12-14 00:32:17 -0800 |
| commit | bf5873022d2f78aa2780b458afa18985057e0b60 (patch) | |
| tree | 81f5810adf3320422e8efbe9e3a61c15519c4bff /weed/server | |
| parent | 5cffddebb91d71c395721f02c69279da8e685ed1 (diff) | |
| parent | b7e3ca91727d6ad12f99aa7fd18ad23e13875f6c (diff) | |
| download | seaweedfs-bf5873022d2f78aa2780b458afa18985057e0b60.tar.xz seaweedfs-bf5873022d2f78aa2780b458afa18985057e0b60.zip | |
Merge branch 'master' into support_ssd_volume
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_server.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 24a5d61b1..9404081b4 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -108,10 +108,10 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste ms.guard = security.NewGuard(ms.option.WhiteList, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec) + handleStaticResources2(r) + r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) + r.HandleFunc("/ui/index.html", ms.uiStatusHandler) if !ms.option.DisableHttp { - handleStaticResources2(r) - 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.guard.WhiteList(ms.dirLookupHandler)) r.HandleFunc("/dir/status", ms.proxyToLeader(ms.guard.WhiteList(ms.dirStatusHandler))) |