github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reduce loading global env

Browse Source
This commit is contained in:
Kazuhiro NISHIYAMA
2017-11-03 13:27:23 +09:00
parent 85fa7a5bb0
commit e9506e80cb
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/config/subcommands.go
View File

@@ -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. //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) { func getEnvironment(appName string, merged bool) (env *Env) {
env, err := loadAppOrGlobalEnv(appName) var err error
if err != nil {
common.LogFail(err.Error())
}
if appName != "" && merged { if appName != "" && merged {
env, err = LoadMergedAppEnv(appName) env, err = LoadMergedAppEnv(appName)
if err != nil { } else {
common.LogFail(err.Error()) env, err = loadAppOrGlobalEnv(appName)
} }
if err != nil {
common.LogFail(err.Error())
} }
return env return env
} }