cmd/docker: small performance optimizations for running hooks
Order conditions to check for lightweight ones first; - checck if the command is not nil - dockerCli.Out().IsTerminal() is a lightweight getter - dockerCli.HooksEnabled() checks for env-vars, parses booleans, and reading the CLI config-file Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
ea1f10b440
commit
a2d78071c1
@ -446,7 +446,7 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
|
||||
if err != nil || pluginmanager.IsPluginCommand(ccmd) {
|
||||
err := tryPluginRun(ctx, dockerCli, cmd, args[0], envs)
|
||||
if err == nil {
|
||||
if dockerCli.HooksEnabled() && dockerCli.Out().IsTerminal() && ccmd != nil {
|
||||
if ccmd != nil && dockerCli.Out().IsTerminal() && dockerCli.HooksEnabled() {
|
||||
pluginmanager.RunPluginHooks(ctx, dockerCli, cmd, ccmd, args)
|
||||
}
|
||||
return nil
|
||||
@ -471,7 +471,7 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
|
||||
|
||||
// If the command is being executed in an interactive terminal
|
||||
// and hook are enabled, run the plugin hooks.
|
||||
if dockerCli.HooksEnabled() && dockerCli.Out().IsTerminal() && subCommand != nil {
|
||||
if subCommand != nil && dockerCli.Out().IsTerminal() && dockerCli.HooksEnabled() {
|
||||
var errMessage string
|
||||
if err != nil {
|
||||
errMessage = err.Error()
|
||||
|
Loading…
x
Reference in New Issue
Block a user