From 16fc3fb1a014a4814a3dd211cdb9e033804ed849 Mon Sep 17 00:00:00 2001 From: bingoohuang Date: Mon, 25 May 2020 20:45:21 +0800 Subject: [PATCH 1/2] fix build error --- unmaintained/volume_tailer/volume_tailer.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unmaintained/volume_tailer/volume_tailer.go b/unmaintained/volume_tailer/volume_tailer.go index 3c2d36d22..d9220d2de 100644 --- a/unmaintained/volume_tailer/volume_tailer.go +++ b/unmaintained/volume_tailer/volume_tailer.go @@ -9,7 +9,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/storage/needle" util2 "github.com/chrislusf/seaweedfs/weed/util" - "github.com/spf13/viper" "golang.org/x/tools/godoc/util" ) @@ -25,7 +24,7 @@ func main() { flag.Parse() util2.LoadConfiguration("security", false) - grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") + grpcDialOption := security.LoadClientTLS(util2.GetViper(), "grpc.client") vid := needle.VolumeId(*volumeId) From ecdeef8c66eadbf9b4e8ac7f221444d1d92a9de0 Mon Sep 17 00:00:00 2001 From: bingoohuang Date: Mon, 25 May 2020 21:00:12 +0800 Subject: [PATCH 2/2] simplify func(w http.ResponseWriter, r *http.Request) to http.HandlerFunc --- weed/security/guard.go | 2 +- weed/server/master_server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weed/security/guard.go b/weed/security/guard.go index 17fe2ea9e..87ec91ec1 100644 --- a/weed/security/guard.go +++ b/weed/security/guard.go @@ -62,7 +62,7 @@ func NewGuard(whiteList []string, signingKey string, expiresAfterSec int, readSi return g } -func (g *Guard) WhiteList(f func(w http.ResponseWriter, r *http.Request)) func(w http.ResponseWriter, r *http.Request) { +func (g *Guard) WhiteList(f http.HandlerFunc) http.HandlerFunc { if !g.isWriteActive { //if no security needed, just skip all checking return f diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 82b306fc4..53ac7b2e2 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -156,7 +156,7 @@ func (ms *MasterServer) SetRaftServer(raftServer *RaftServer) { } } -func (ms *MasterServer) proxyToLeader(f func(w http.ResponseWriter, r *http.Request)) func(w http.ResponseWriter, r *http.Request) { +func (ms *MasterServer) proxyToLeader(f http.HandlerFunc) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { if ms.Topo.IsLeader() { f(w, r)