From 18a4de2bb288d44c4e5a7560fced7a15e9a6469d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 5 Feb 2021 09:02:14 +0000 Subject: add --max, --before, --after switches to dtail and dgrep commands --- cmd/dgrep/main.go | 7 ++++++- cmd/dtail/main.go | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index 4da1bb3..4a6790b 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -36,12 +36,17 @@ func main() { flag.IntVar(&sshPort, "port", 2222, "SSH server port") flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method") flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key") - flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression") flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect") flag.StringVar(&args.UserName, "user", userName, "Your system user name") flag.StringVar(&args.What, "files", "", "File(s) to read") flag.StringVar(&cfgFile, "cfg", "", "Config file path") + + // Context awareness. + flag.StringVar(&args.LineContext.RegexStr, "regex", ".", "Regular expression") flag.StringVar(&grep, "grep", "", "Alias for -regex") + flag.IntVar(&args.LineContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") + flag.IntVar(&args.LineContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") + flag.IntVar(&args.LineContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") flag.Parse() diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index f2a039f..1930483 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -50,14 +50,19 @@ func main() { flag.IntVar(&sshPort, "port", 2222, "SSH server port") flag.StringVar(&args.Discovery, "discovery", "", "Server discovery method") flag.StringVar(&args.PrivateKeyPathFile, "key", "", "Path to private key") - flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression") flag.StringVar(&args.ServersStr, "servers", "", "Remote servers to connect") flag.StringVar(&args.UserName, "user", userName, "Your system user name") flag.StringVar(&args.What, "files", "", "File(s) to read") flag.StringVar(&cfgFile, "cfg", "", "Config file path") - flag.StringVar(&grep, "grep", "", "Alias for -regex") flag.StringVar(&queryStr, "query", "", "Map reduce query") + // Context awareness. + flag.StringVar(&args.LineContext.RegexStr, "regex", ".", "Regular expression") + flag.StringVar(&grep, "grep", "", "Alias for -regex") + flag.IntVar(&args.LineContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") + flag.IntVar(&args.LineContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") + flag.IntVar(&args.LineContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") + flag.Parse() if grep != "" { -- cgit v1.2.3 From 6f093ff69c83526279b9f039aca079162c2b68d5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 5 Feb 2021 09:32:52 +0000 Subject: refactor --- cmd/dgrep/main.go | 18 +++++++++--------- cmd/dtail/main.go | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'cmd') diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go index 4a6790b..123d061 100644 --- a/cmd/dgrep/main.go +++ b/cmd/dgrep/main.go @@ -41,15 +41,19 @@ func main() { flag.StringVar(&args.What, "files", "", "File(s) to read") flag.StringVar(&cfgFile, "cfg", "", "Config file path") - // Context awareness. - flag.StringVar(&args.LineContext.RegexStr, "regex", ".", "Regular expression") + // Line context awareness. + flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression") flag.StringVar(&grep, "grep", "", "Alias for -regex") - flag.IntVar(&args.LineContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") - flag.IntVar(&args.LineContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") - flag.IntVar(&args.LineContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") + flag.IntVar(&args.LContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") + flag.IntVar(&args.LContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") + flag.IntVar(&args.LContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") flag.Parse() + if grep != "" { + args.RegexStr = grep + } + config.Read(cfgFile, sshPort) color.Colored = !noColor @@ -63,10 +67,6 @@ func main() { Quiet: args.Quiet, }) - if grep != "" { - args.RegexStr = grep - } - client, err := clients.NewGrepClient(args) if err != nil { panic(err) diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go index 1930483..2639b4b 100644 --- a/cmd/dtail/main.go +++ b/cmd/dtail/main.go @@ -56,12 +56,12 @@ func main() { flag.StringVar(&cfgFile, "cfg", "", "Config file path") flag.StringVar(&queryStr, "query", "", "Map reduce query") - // Context awareness. - flag.StringVar(&args.LineContext.RegexStr, "regex", ".", "Regular expression") + // Line context awareness. + flag.StringVar(&args.RegexStr, "regex", ".", "Regular expression") flag.StringVar(&grep, "grep", "", "Alias for -regex") - flag.IntVar(&args.LineContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") - flag.IntVar(&args.LineContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") - flag.IntVar(&args.LineContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") + flag.IntVar(&args.LContext.BeforeContext, "before", 0, "Print lines of leading context before matching lines") + flag.IntVar(&args.LContext.AfterContext, "after", 0, "Print lines of trailing context after matching lines") + flag.IntVar(&args.LContext.MaxCount, "max", 0, "Stop reading file after NUM matching lines") flag.Parse() -- cgit v1.2.3