client.StatusError don't be returned as a pointer
closes #12373 1. remove & from client.StatusError 2. remove * from Error method Signed-off-by: Deshi Xiao <xiaods@gmail.com>
This commit is contained in:
parent
da697dbed6
commit
bae3023eef
8 changed files with 10 additions and 10 deletions
|
@ -80,7 +80,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
|
|||
return err
|
||||
}
|
||||
if status != 0 {
|
||||
return &StatusError{StatusCode: status}
|
||||
return StatusError{StatusCode: status}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
@ -302,7 +302,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
|
|||
if jerr.Code == 0 {
|
||||
jerr.Code = 1
|
||||
}
|
||||
return &StatusError{Status: jerr.Message, StatusCode: jerr.Code}
|
||||
return StatusError{Status: jerr.Message, StatusCode: jerr.Code}
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -12,6 +12,6 @@ type StatusError struct {
|
|||
StatusCode int
|
||||
}
|
||||
|
||||
func (e *StatusError) Error() string {
|
||||
func (e StatusError) Error() string {
|
||||
return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
|
|||
execConfig, err := runconfig.ParseExec(cmd, args)
|
||||
// just in case the ParseExec does not exit
|
||||
if execConfig.Container == "" || err != nil {
|
||||
return &StatusError{StatusCode: 1}
|
||||
return StatusError{StatusCode: 1}
|
||||
}
|
||||
|
||||
stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, nil)
|
||||
|
@ -121,7 +121,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
|
|||
}
|
||||
|
||||
if status != 0 {
|
||||
return &StatusError{StatusCode: status}
|
||||
return StatusError{StatusCode: status}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
@ -26,7 +26,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
|
|||
var err error
|
||||
if tmpl, err = template.New("").Funcs(funcMap).Parse(*tmplStr); err != nil {
|
||||
fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)
|
||||
return &StatusError{StatusCode: 64,
|
||||
return StatusError{StatusCode: 64,
|
||||
Status: "Template parsing error: " + err.Error()}
|
||||
}
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
|
|||
}
|
||||
|
||||
if status != 0 {
|
||||
return &StatusError{StatusCode: status}
|
||||
return StatusError{StatusCode: status}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -241,7 +241,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
|
|||
}
|
||||
}
|
||||
if status != 0 {
|
||||
return &StatusError{StatusCode: status}
|
||||
return StatusError{StatusCode: status}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -155,7 +155,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
|
|||
return err
|
||||
}
|
||||
if status != 0 {
|
||||
return &StatusError{StatusCode: status}
|
||||
return StatusError{StatusCode: status}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
|
|
@ -135,7 +135,7 @@ func main() {
|
|||
}
|
||||
|
||||
if err := cli.Cmd(flag.Args()...); err != nil {
|
||||
if sterr, ok := err.(*client.StatusError); ok {
|
||||
if sterr, ok := err.(client.StatusError); ok {
|
||||
if sterr.Status != "" {
|
||||
logrus.Println(sterr.Status)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue