diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2017-01-08 10:30:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 10:30:40 -0800 |
| commit | b14332df96c5a51b5d21730d74b06ccb379b2657 (patch) | |
| tree | 7ade8269a6d1aed75c73b7882371637b008dbc2f /weed/topology | |
| parent | 13e7069eb9cd72f94e72acb8fbbc9dd0307da703 (diff) | |
| parent | da9b672d1bce089c7a74e6b4bb68bb68cc4097f2 (diff) | |
| download | seaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.tar.xz seaweedfs-b14332df96c5a51b5d21730d74b06ccb379b2657.zip | |
Merge pull request #432 from sparklxb/master
support additional header name-value pairs
Diffstat (limited to 'weed/topology')
| -rw-r--r-- | weed/topology/store_replicate.go | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/weed/topology/store_replicate.go b/weed/topology/store_replicate.go index be5777167..aa312ac03 100644 --- a/weed/topology/store_replicate.go +++ b/weed/topology/store_replicate.go @@ -2,14 +2,14 @@ package topology import ( "bytes" + "encoding/json" "errors" "fmt" "net/http" + "net/url" "strconv" "strings" - "net/url" - "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/security" @@ -55,9 +55,18 @@ func ReplicatedWrite(masterNode string, s *storage.Store, q.Set("cm", "true") } u.RawQuery = q.Encode() + + pairMap := make(map[string]string) + if needle.HasPairs() { + err := json.Unmarshal(needle.Pairs, &pairMap) + if err != nil { + glog.V(0).Infoln("Unmarshal pairs error:", err) + } + } + _, err := operation.Upload(u.String(), string(needle.Name), bytes.NewReader(needle.Data), needle.IsGzipped(), string(needle.Mime), - jwt) + pairMap, jwt) return err }); err != nil { ret = 0 |
