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

feat: allow formatting :report command output as json

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-02-01 22:23:05 -05:00
parent cc2f054e6a
commit 033b0952dd
34 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ps/report.go
View File

@@ -9,7 +9,7 @@ import (
)
// ReportSingleApp is an internal function that displays the ps report for one or more apps
func ReportSingleApp(appName, infoFlag string) error {
func ReportSingleApp(appName string, format string, infoFlag string) error {
if err := common.VerifyAppName(appName); err != nil {
return err
}
@@ -36,7 +36,7 @@ func ReportSingleApp(appName, infoFlag string) error {
trimPrefix := false
uppercaseFirstCharacter := true
infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, flagKeys, trimPrefix, uppercaseFirstCharacter)
return common.ReportSingleApp("ps", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
}
func addStatusFlags(appName string, infoFlag string) map[string]common.ReportFunc {

3
plugins/ps/src/subcommands/subcommands.go
View File

@@ -32,11 +32,12 @@ func main() {
err = ps.CommandRebuild(appName, *allApps, *parallelCount)
case "report":
args := flag.NewFlagSet("ps:report", flag.ExitOnError)
format := args.String("format", "stdout", "format: [ stdout | json ]")
osArgs, infoFlag, flagErr := common.ParseReportArgs("ps", os.Args[2:])
if flagErr == nil {
args.Parse(osArgs)
appName := args.Arg(0)
err = ps.CommandReport(appName, infoFlag)
err = ps.CommandReport(appName, *format, infoFlag)
}
case "restart":
args := flag.NewFlagSet("ps:restart", flag.ExitOnError)

2
plugins/ps/src/triggers/triggers.go
View File

@@ -73,7 +73,7 @@ func main() {
err = ps.TriggerProcfileRemove(appName)
case "report":
appName := flag.Arg(0)
err = ps.ReportSingleApp(appName, "")
err = ps.ReportSingleApp(appName, "", "")
default:
common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger))
}

6
plugins/ps/subcommands.go
View File

@@ -35,21 +35,21 @@ func CommandRebuild(appName string, allApps bool, parallelCount int) error {
}
// CommandReport displays a ps report for one or more apps
func CommandReport(appName string, infoFlag string) error {
func CommandReport(appName string, format string, infoFlag string) error {
if len(appName) == 0 {
apps, err := common.DokkuApps()
if err != nil {
return err
}
for _, appName := range apps {
if err := ReportSingleApp(appName, infoFlag); err != nil {
if err := ReportSingleApp(appName, format, infoFlag); err != nil {
return err
}
}
return nil
}
return ReportSingleApp(appName, infoFlag)
return ReportSingleApp(appName, format, infoFlag)
}
// CommandRestart restarts an app