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

fix: properly parse flags for logs command

Browse Source 
Closes #4256
This commit is contained in:
Jose Diaz-Gonzalez
2020-12-21 16:50:34 -05:00
parent dba4bb9c2c
commit 4d0979bbcd
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/logs/src/commands/commands.go
View File

@@ -1,7 +1,6 @@
package main package main
import ( import (
"flag"
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
@@ -9,6 +8,10 @@ import (
"github.com/dokku/dokku/plugins/common" "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/logs" "github.com/dokku/dokku/plugins/logs"
stdFlag "flag"
flag "github.com/spf13/pflag"
) )
const ( const (
@@ -19,39 +22,32 @@ Manage log integration for an app
Additional commands:` Additional commands:`
helpContent = ` helpContent = `
logs [-h] [-t] [-n num] [-q] [-p process] <app>, Display recent log output logs [-h] [-t|--tail] [-n|--num num] [-q|--quiet] [-p|--ps process] <app>, Display recent log output
logs:failed [<app>], Shows the last failed deploy logs logs:failed [<app>], Shows the last failed deploy logs
` `
) )
func main() { func main() {
flag.Usage = usage stdFlag.Usage = usage
flag.Parse() stdFlag.Parse()
cmd := flag.Arg(0) cmd := stdFlag.Arg(0)
switch cmd { switch cmd {
case "logs": case "logs":
args := flag.NewFlagSet("logs", flag.ExitOnError) args := flag.NewFlagSet("logs", flag.ExitOnError)
var num int64
var ps string
var tail bool
var quiet bool
help := args.Bool("h", false, "-h: print help for the command") help := args.Bool("h", false, "-h: print help for the command")
args.Int64Var(&num, "n", 0, "-n: the number of lines to display") num := args.Int64P("num", "n", 100, "the number of lines to display")
args.Int64Var(&num, "num", 0, "--num: the number of lines to display") ps := args.StringP("ps", "p", "", "only display logs from the given process")
args.StringVar(&ps, "p", "", "-p: only display logs from the given process") tail := args.BoolP("tail", "t", false, "continually stream logs")
args.StringVar(&ps, "ps", "", "--p: only display logs from the given process") quiet := args.BoolP("quiet", "q", false, "display raw logs without colors, time and names")
args.BoolVar(&tail, "t", true, "-t: continually stream logs") args.Parse(os.Args[2:])
args.BoolVar(&tail, "tail", true, "--tail: continually stream logs")
args.BoolVar(&quiet, "q", true, "-q: display raw logs without colors, time and names")
args.BoolVar(&quiet, "quiet", true, "--quiet: display raw logs without colors, time and names")
args.Parse(flag.Args()[1:])
if *help { if *help {
usage() usage()
return return
} }
appName := args.Arg(0) appName := args.Arg(0)
err := logs.CommandDefault(appName, num, ps, tail, quiet) err := logs.CommandDefault(appName, *num, *ps, *tail, *quiet)
if err != nil { if err != nil {
common.LogFail(err.Error()) common.LogFail(err.Error())
} }

1
plugins/logs/subcommands.go
View File

@@ -26,6 +26,7 @@ func CommandDefault(appName string, num int64, process string, tail, quiet bool)
t := strconv.FormatBool(tail) t := strconv.FormatBool(tail)
q := strconv.FormatBool(quiet) q := strconv.FormatBool(quiet)
n := strconv.FormatInt(num, 10) n := strconv.FormatInt(num, 10)
if err := common.PlugnTrigger("scheduler-logs", []string{s, appName, process, t, q, n}...); err != nil { if err := common.PlugnTrigger("scheduler-logs", []string{s, appName, process, t, q, n}...); err != nil {
return err return err
} }