diff options
| author | Paul Buetow <paul@buetow.org> | 2021-09-18 13:16:36 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2021-10-02 12:26:29 +0300 |
| commit | 7fbea88cf55af9b3354b4a1334e49c38d0d920fc (patch) | |
| tree | a8451bef0a7b8860f1729b8919ca6e44b95e130b /cmd | |
| parent | 5e717af91e8012c72ec7dc0204420dea46f187db (diff) | |
additional flags can be interpreted as file list
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dcat/main.go | 10 | ||||
| -rw-r--r-- | cmd/dgrep/main.go | 10 | ||||
| -rw-r--r-- | cmd/dmap/main.go | 12 | ||||
| -rw-r--r-- | cmd/dtail/main.go | 10 |
4 files changed, 41 insertions, 1 deletions
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go index 1732c26..2ac773a 100644 --- a/cmd/dcat/main.go +++ b/cmd/dcat/main.go @@ -4,6 +4,7 @@ import ( "context" "flag" "os" + "strings" "github.com/mimecast/dtail/internal/clients" "github.com/mimecast/dtail/internal/config" @@ -40,6 +41,15 @@ func main() { flag.Parse() + if args.What == "" { + // Interpret additional args as file list. + var files []string + for _, file := range flag.Args() { + files = append(files, file) + } + args.What = strings.Join(files, ",") + } + config.Read(cfgFile, sshPort) if noColor { config.Client.TermColorsEnable = false diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index f32be34..35b2236 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -4,6 +4,7 @@ import ( "context" "flag" "os" + "strings" "github.com/mimecast/dtail/internal/clients" "github.com/mimecast/dtail/internal/config" @@ -44,6 +45,15 @@ func main() { flag.Parse() + if args.What == "" { + // Interpret additional args as file list. + var files []string + for _, file := range flag.Args() { + files = append(files, file) + } + args.What = strings.Join(files, ",") + } + config.Read(cfgFile, sshPort) if noColor { config.Client.TermColorsEnable = false diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go index f99be52..ab710ac 100644 --- a/cmd/dmap/main.go +++ b/cmd/dmap/main.go @@ -4,6 +4,7 @@ import ( "context" "flag" "os" + "strings" "github.com/mimecast/dtail/internal/clients" "github.com/mimecast/dtail/internal/config" @@ -47,6 +48,15 @@ func main() { flag.Parse() + if args.What == "" { + // Interpret additional args as file list. + var files []string + for _, file := range flag.Args() { + files = append(files, file) + } + args.What = strings.Join(files, ",") + } + config.Read(cfgFile, sshPort) if noColor { config.Client.TermColorsEnable = false @@ -65,7 +75,7 @@ func main() { client, err := clients.NewMaprClient(args, queryStr, clients.DefaultMode) if err != nil { - panic(err) + logger.FatalExit(err) } status := client.Start(ctx, signal.InterruptCh(ctx)) diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index b41e9bb..3c3443f 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -8,6 +8,7 @@ import ( _ "net/http" _ "net/http/pprof" "os" + "strings" "time" "github.com/mimecast/dtail/internal/clients" @@ -62,6 +63,15 @@ func main() { flag.Parse() + if args.What == "" { + // Interpret additional args as file list. + var files []string + for _, file := range flag.Args() { + files = append(files, file) + } + args.What = strings.Join(files, ",") + } + if grep != "" { args.RegexStr = grep } |