diff options
| author | chrislu <chris.lu@gmail.com> | 2024-06-14 11:42:05 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-06-14 11:42:05 -0700 |
| commit | 32dbb6a2ceb86a44d7879bdb506ab759d59f056b (patch) | |
| tree | 94c1d9cd5c086b437c4df2847b1a42b6432b535b /weed/command/upload.go | |
| parent | 70b31e3a28b8169289bb9c55052355a3daacfd12 (diff) | |
| parent | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (diff) | |
| download | seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.tar.xz seaweedfs-32dbb6a2ceb86a44d7879bdb506ab759d59f056b.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed/command/upload.go')
| -rw-r--r-- | weed/command/upload.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/command/upload.go b/weed/command/upload.go index 1f03f7b5a..3e6b8f9a2 100644 --- a/weed/command/upload.go +++ b/weed/command/upload.go @@ -97,7 +97,7 @@ func runUpload(cmd *Command, args []string) bool { if e != nil { return e } - results, e := operation.SubmitFiles(func() pb.ServerAddress { return pb.ServerAddress(*upload.master) }, grpcDialOption, parts, *upload.replication, *upload.collection, *upload.dataCenter, *upload.ttl, *upload.diskType, *upload.maxMB, *upload.usePublicUrl) + results, e := operation.SubmitFiles(func(_ context.Context) pb.ServerAddress { return pb.ServerAddress(*upload.master) }, grpcDialOption, parts, *upload.replication, *upload.collection, *upload.dataCenter, *upload.ttl, *upload.diskType, *upload.maxMB, *upload.usePublicUrl) bytes, _ := json.Marshal(results) fmt.Println(string(bytes)) if e != nil { @@ -119,7 +119,7 @@ func runUpload(cmd *Command, args []string) bool { fmt.Println(e.Error()) return false } - results, err := operation.SubmitFiles(func() pb.ServerAddress { return pb.ServerAddress(*upload.master) }, grpcDialOption, parts, *upload.replication, *upload.collection, *upload.dataCenter, *upload.ttl, *upload.diskType, *upload.maxMB, *upload.usePublicUrl) + results, err := operation.SubmitFiles(func(_ context.Context) pb.ServerAddress { return pb.ServerAddress(*upload.master) }, grpcDialOption, parts, *upload.replication, *upload.collection, *upload.dataCenter, *upload.ttl, *upload.diskType, *upload.maxMB, *upload.usePublicUrl) if err != nil { fmt.Println(err.Error()) return false |