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

feat: short-circuit report fetching if only retrieving a single value

Browse Source 
This speeds up report output when specifying a flag as extra data that isn't used will not be fetched unnecessarily.
This commit is contained in:
Jose Diaz-Gonzalez
2020-12-30 00:37:43 -05:00
parent 38b96c1e27
commit 0e320d2832
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/apps/report.go
View File

@@ -20,7 +20,7 @@ func ReportSingleApp(appName, infoFlag string) error {
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("app", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("app", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
} }

2
plugins/buildpacks/report.go
View File

@@ -18,7 +18,7 @@ func ReportSingleApp(appName, infoFlag string) error {
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("buildpacks", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("buildpacks", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
} }

6
plugins/common/parallel.go
View File

@@ -139,10 +139,14 @@ type ReportFunc func(string) string
// CollectReport iterates over a set of report functions // CollectReport iterates over a set of report functions
// to collect the :report output in parallel // to collect the :report output in parallel
func CollectReport(appName string, flags map[string]ReportFunc) map[string]string { func CollectReport(appName string, infoFlag string, flags map[string]ReportFunc) map[string]string {
var sm sync.Map var sm sync.Map
var wg sync.WaitGroup var wg sync.WaitGroup
for flag, fn := range flags { for flag, fn := range flags {
if infoFlag != "" && infoFlag != flag {
continue
}
wg.Add(1) wg.Add(1)
go func(flag string, fn ReportFunc) { go func(flag string, fn ReportFunc) {
defer wg.Done() defer wg.Done()

2
plugins/network/report.go
View File

@@ -21,7 +21,7 @@ func ReportSingleApp(appName, infoFlag string) error {
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("network", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("network", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
} }

2
plugins/proxy/report.go
View File

@@ -20,7 +20,7 @@ func ReportSingleApp(appName string, infoFlag string) error {
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("proxy", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
} }

2
plugins/ps/report.go
View File

@@ -46,7 +46,7 @@ func ReportSingleApp(appName, infoFlag string) error {
trimPrefix := false trimPrefix := false
uppercaseFirstCharacter := true uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, flags) infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter) return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, trimPrefix, uppercaseFirstCharacter)
} }