优化error输出
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"git.algo.com.cn/public/saasapi"
|
||||
"git.algo.com.cn/public/saasapi/pkg/saashttp"
|
||||
@@ -22,8 +21,7 @@ func RunTaskDelete(args ...string) error {
|
||||
sha256 := paramSha256(fs)
|
||||
|
||||
if err := fs.Parse(args); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Command line parse error: %w", err)
|
||||
}
|
||||
|
||||
if fs.NArg() > 0 || len(*sha256) == 0 {
|
||||
@@ -33,8 +31,7 @@ func RunTaskDelete(args ...string) error {
|
||||
|
||||
cfg, err := LoadConfigFile(*cfgFile)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("LoadConfigFile error: %w", err)
|
||||
}
|
||||
|
||||
deleteTaskParams := deleteTaskParams{
|
||||
@@ -46,15 +43,11 @@ func RunTaskDelete(args ...string) error {
|
||||
},
|
||||
}
|
||||
|
||||
taskRes, err := doTaskDelete(deleteTaskParams)
|
||||
return doTaskDelete(deleteTaskParams)
|
||||
|
||||
if err != nil {
|
||||
fmt.Printf("task res: %v\n", protojson.Format(taskRes))
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func doTaskDelete(deleteTaskParams deleteTaskParams) (*saasapi.Task, error) {
|
||||
func doTaskDelete(deleteTaskParams deleteTaskParams) error {
|
||||
saasReq := &saasapi.SaasReq{
|
||||
Cmd: &saasapi.SaasReq_TaskDelete{
|
||||
TaskDelete: &saasapi.TaskDelete{
|
||||
@@ -65,17 +58,14 @@ func doTaskDelete(deleteTaskParams deleteTaskParams) (*saasapi.Task, error) {
|
||||
|
||||
res, err := deleteTaskParams.saasHttp.TaskDelete(saasReq)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "submit Task delete error", "err", err)
|
||||
return nil, err
|
||||
return fmt.Errorf("Submit Command error: %w", err)
|
||||
}
|
||||
|
||||
if res.Code != saasapi.ErrorCode_SUCC {
|
||||
err = fmt.Errorf("task delete failed. code:%v, status:%v", res.Code, res.Status)
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
return nil, err
|
||||
return fmt.Errorf("Command failed. code:%v, status:%v", res.Code, res.Status)
|
||||
}
|
||||
|
||||
taskRes := res.GetTaskDeleteRes()
|
||||
fmt.Println(protojson.Format(taskRes))
|
||||
return taskRes, nil
|
||||
fmt.Printf("task res: %v\n", protojson.Format(taskRes))
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user