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

Merge pull request #2115 from nagy/exitcode

Browse source 
Return correct exitcode when `wheed upload` fails
This commit is contained in:
Chris Lu 2021-06-07 15:47:08 -07:00 committed by GitHub
parent 76f24af79a 0e3adde47f
commit 492a91e0b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
weed/command/upload.go
View file

@ -84,7 +84,7 @@ func runUpload(cmd *Command, args []string) bool {
if *upload.dir == "" { if *upload.dir == "" {
return false return false
} }
filepath.Walk(util.ResolvePath(*upload.dir), func(path string, info os.FileInfo, err error) error { err = filepath.Walk(util.ResolvePath(*upload.dir), func(path string, info os.FileInfo, err error) error {
if err == nil { if err == nil {
if !info.IsDir() { if !info.IsDir() {
if *upload.include != "" { if *upload.include != "" {
@ -108,12 +108,21 @@ func runUpload(cmd *Command, args []string) bool {
} }
return err return err
}) })
if err != nil {
fmt.Println(err.Error())
return false;
}
} else { } else {
parts, e := operation.NewFileParts(args) parts, e := operation.NewFileParts(args)
if e != nil { if e != nil {
fmt.Println(e.Error()) fmt.Println(e.Error())
return false
}
results, err := operation.SubmitFiles(func() string { return *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
} }
results, _ := operation.SubmitFiles(func() string { return *upload.master }, grpcDialOption, parts, *upload.replication, *upload.collection, *upload.dataCenter, *upload.ttl, *upload.diskType, *upload.maxMB, *upload.usePublicUrl)
bytes, _ := json.Marshal(results) bytes, _ := json.Marshal(results)
fmt.Println(string(bytes)) fmt.Println(string(bytes))
} }