From e9506e80cb696cc5b2a18889965404774104fcea Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Nov 2017 13:27:23 +0900 Subject: [PATCH 1/2] Reduce loading global env --- plugins/config/subcommands.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go index a5b564933..dc35bcf3b 100644 --- a/plugins/config/subcommands.go +++ b/plugins/config/subcommands.go @@ -136,15 +136,14 @@ func CommandBundle(args []string, global bool, merged bool) { //getEnvironment for the given app (global config if appName is empty). Merge with global environment if merged is true. func getEnvironment(appName string, merged bool) (env *Env) { - env, err := loadAppOrGlobalEnv(appName) - if err != nil { - common.LogFail(err.Error()) - } + var err error if appName != "" && merged { env, err = LoadMergedAppEnv(appName) - if err != nil { - common.LogFail(err.Error()) - } + } else { + env, err = loadAppOrGlobalEnv(appName) + } + if err != nil { + common.LogFail(err.Error()) } return env } From 71763e18f687444d259f6567b5fd51543cbecdb6 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Nov 2017 13:28:08 +0900 Subject: [PATCH 2/2] Reduce copying args when global --- plugins/config/subcommands.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go index dc35bcf3b..919aaed38 100644 --- a/plugins/config/subcommands.go +++ b/plugins/config/subcommands.go @@ -150,7 +150,7 @@ func getEnvironment(appName string, merged bool) (env *Env) { //getCommonArgs extracts common positional args (appName and keys) func getCommonArgs(global bool, args []string) (appName string, keys []string) { - nextArg := 0 + keys = args if !global { if len(args) > 0 { appName = args[0] @@ -158,9 +158,8 @@ func getCommonArgs(global bool, args []string) (appName string, keys []string) { if appName == "" { common.LogFail("Please specify an app or --global") } else { - nextArg++ + keys = args[1:] } } - keys = args[nextArg:] return appName, keys }