优化error输出
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -39,8 +38,7 @@ func RunExpGet(args ...string) error {
|
||||
extFields := paramExtFields(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 {
|
||||
@@ -54,28 +52,24 @@ func RunExpGet(args ...string) error {
|
||||
for _, id := range expIDsSlice {
|
||||
idNum, err := strconv.ParseUint(id, 10, 32)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "expid parse error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Expid parse error. value: %v. %w", id, err)
|
||||
}
|
||||
|
||||
if idNum == 0 || idNum > 10 {
|
||||
fmt.Fprintln(os.Stderr, "expid range error")
|
||||
return nil
|
||||
return fmt.Errorf("Expid range error.")
|
||||
}
|
||||
bucketIDsNumSlice = append(bucketIDsNumSlice, uint32(idNum))
|
||||
}
|
||||
}
|
||||
|
||||
if *beginDay < 20250101 || *beginDay > 21001231 || *endDay < 20250101 || *endDay > 21001231 {
|
||||
fmt.Fprintln(os.Stderr, "begin/end day error")
|
||||
fs.PrintDefaults()
|
||||
return nil
|
||||
return fmt.Errorf("Begin/End day error.")
|
||||
}
|
||||
|
||||
if *target == "" {
|
||||
fmt.Fprintln(os.Stderr, "target error")
|
||||
fs.PrintDefaults()
|
||||
return nil
|
||||
return fmt.Errorf("Target error.")
|
||||
}
|
||||
|
||||
uidNumSlice := []uint64{}
|
||||
@@ -84,13 +78,11 @@ func RunExpGet(args ...string) error {
|
||||
for _, id := range uidSlice {
|
||||
idNum, err := strconv.ParseUint(id, 10, 64)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "advertiser id parse error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Advertiser id parse error. value: %v. %w", id, err)
|
||||
}
|
||||
|
||||
if idNum == 0 {
|
||||
fmt.Fprintln(os.Stderr, "advertiser id error")
|
||||
return nil
|
||||
return fmt.Errorf("Advertiser id error.")
|
||||
}
|
||||
uidNumSlice = append(uidNumSlice, idNum)
|
||||
}
|
||||
@@ -102,8 +94,7 @@ func RunExpGet(args ...string) error {
|
||||
groupBySlice = strings.Split(*groupBy, ",")
|
||||
for _, group := range groupBySlice {
|
||||
if !validGroupBy[group] {
|
||||
fmt.Fprintln(os.Stderr, "group by error", "group", group)
|
||||
return nil
|
||||
return fmt.Errorf("Group by error. group:", group)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -112,15 +103,13 @@ func RunExpGet(args ...string) error {
|
||||
if *extFields != "" {
|
||||
extFieldsSlice = strings.Split(*extFields, ",")
|
||||
if slices.Contains(extFieldsSlice, "") {
|
||||
fmt.Fprintln(os.Stderr, "ext field error")
|
||||
return nil
|
||||
return fmt.Errorf("Ext field 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)
|
||||
}
|
||||
|
||||
getExpParams := getExpParams{
|
||||
@@ -164,15 +153,12 @@ func doExpGet(getExpParams getExpParams) error {
|
||||
}
|
||||
|
||||
res, err := getExpParams.saasHttp.ExpGet(saasReq)
|
||||
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "submit GetExp error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Submit Command error: %w", err)
|
||||
}
|
||||
|
||||
if res.Code != saasapi.ErrorCode_SUCC {
|
||||
fmt.Fprintln(os.Stderr, "get exp failed", "code", res.Code, "status", res.Status)
|
||||
return nil
|
||||
return fmt.Errorf("Command failed. code:%v, status:%v", res.Code, res.Status)
|
||||
}
|
||||
|
||||
getExpRes := res.GetExpGetRes()
|
||||
|
||||
Reference in New Issue
Block a user