docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1963 from rogpeppe/master 

Client: Use less reflection in command-line method invocation
This commit is contained in:
Victor Vieux 2013-10-24 18:03:20 -07:00
parent 217b6070f0 43fd85eb8f
commit 31111f61e0
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
commands.go
View File

@ -41,9 +41,13 @@ var (
ErrConnectionRefused = errors.New("Can't connect to docker daemon. Is 'docker -d' running on this host?") ErrConnectionRefused = errors.New("Can't connect to docker daemon. Is 'docker -d' running on this host?")
) )
func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) { func (cli *DockerCli) getMethod(name string) (func(...string) error, bool) {
methodName := "Cmd" + strings.ToUpper(name[:1]) + strings.ToLower(name[1:]) methodName := "Cmd" + strings.ToUpper(name[:1]) + strings.ToLower(name[1:])
return reflect.TypeOf(cli).MethodByName(methodName) method := reflect.ValueOf(cli).MethodByName(methodName)
if !method.IsValid() {
return nil, false
}
return method.Interface().(func(...string) error), true
} }
func ParseCommands(proto, addr string, args ...string) error { func ParseCommands(proto, addr string, args ...string) error {
@ -55,14 +59,7 @@ func ParseCommands(proto, addr string, args ...string) error {
fmt.Println("Error: Command not found:", args[0]) fmt.Println("Error: Command not found:", args[0])
return cli.CmdHelp(args[1:]...) return cli.CmdHelp(args[1:]...)
} }
ret := method.Func.CallSlice([]reflect.Value{ return method(args[1:]...)
reflect.ValueOf(cli),
reflect.ValueOf(args[1:]),
})[0].Interface()
if ret == nil {
return nil
}
return ret.(error)
} }
return cli.CmdHelp(args...) return cli.CmdHelp(args...)
} }
@ -73,10 +70,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
if !exists { if !exists {
fmt.Fprintf(cli.err, "Error: Command not found: %s\n", args[0]) fmt.Fprintf(cli.err, "Error: Command not found: %s\n", args[0])
} else { } else {
method.Func.CallSlice([]reflect.Value{ method("--help")
reflect.ValueOf(cli),
reflect.ValueOf([]string{"--help"}),
})[0].Interface()
return nil return nil
} }
} }