gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

avoid util package depends on security package

Browse source
This commit is contained in:
Chris Lu 2019-02-16 12:23:35 -08:00
parent 31aa60ce05
commit 98a03b38e5
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unmaintained/repeated_vacuum/repeated_vacuum.go
View file

@ -36,7 +36,7 @@ func main() {
log.Fatalf("upload: %v", err) log.Fatalf("upload: %v", err)
} }
util.Delete(targetUrl, assignResult.Auth) util.Delete(targetUrl, string(assignResult.Auth))
util.Get(fmt.Sprintf("http://%s/vol/vacuum", *master)) util.Get(fmt.Sprintf("http://%s/vol/vacuum", *master))

2
weed/command/benchmark.go
View file

@ -200,7 +200,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stat) {
if isSecure { if isSecure {
jwtAuthorization = operation.LookupJwt(masterClient.GetMaster(), df.fp.Fid) jwtAuthorization = operation.LookupJwt(masterClient.GetMaster(), df.fp.Fid)
} }
if e := util.Delete(fmt.Sprintf("http://%s/%s", df.fp.Server, df.fp.Fid), jwtAuthorization); e == nil { if e := util.Delete(fmt.Sprintf("http://%s/%s", df.fp.Server, df.fp.Fid), string(jwtAuthorization)); e == nil {
s.completed++ s.completed++
} else { } else {
s.failed++ s.failed++

2
weed/topology/store_replicate.go
View file

@ -102,7 +102,7 @@ func ReplicatedDelete(masterNode string, store *storage.Store,
if needToReplicate { //send to other replica locations if needToReplicate { //send to other replica locations
if r.FormValue("type") != "replicate" { if r.FormValue("type") != "replicate" {
if err = distributedOperation(masterNode, store, volumeId, func(location operation.Location) error { if err = distributedOperation(masterNode, store, volumeId, func(location operation.Location) error {
return util.Delete("http://"+location.Url+r.URL.Path+"?type=replicate", jwt) return util.Delete("http://"+location.Url+r.URL.Path+"?type=replicate", string(jwt))
}); err != nil { }); err != nil {
ret = 0 ret = 0
} }

4
weed/util/http_util.go
View file

@ -12,8 +12,6 @@ import (
"net/url" "net/url"
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/security"
) )
var ( var (
@ -97,7 +95,7 @@ func Head(url string) (http.Header, error) {
return r.Header, nil return r.Header, nil
} }
func Delete(url string, jwt security.EncodedJwt) error { func Delete(url string, jwt string) error {
req, err := http.NewRequest("DELETE", url, nil) req, err := http.NewRequest("DELETE", url, nil)
if jwt != "" { if jwt != "" {
req.Header.Set("Authorization", "BEARER "+string(jwt)) req.Header.Set("Authorization", "BEARER "+string(jwt))