From 78aebd272dedf561e3980f2ed9532287f41dd7d7 Mon Sep 17 00:00:00 2001 From: Yoann La Cancellera Date: Tue, 7 Nov 2023 17:39:58 +0100 Subject: [PATCH] Commenting out whois+sed, will be re-added later --- src/go/pt-galera-log-explainer/main.go | 6 +++--- src/go/pt-galera-log-explainer/sed.go | 13 ++----------- src/go/pt-galera-log-explainer/whois.go | 15 +++------------ 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/go/pt-galera-log-explainer/main.go b/src/go/pt-galera-log-explainer/main.go index b2872f85..bf879636 100644 --- a/src/go/pt-galera-log-explainer/main.go +++ b/src/go/pt-galera-log-explainer/main.go @@ -36,9 +36,9 @@ var CLI struct { ExcludeRegexes []string `help:"Remove regexes from analysis. List regexes using 'pt-galera-log-explainer regex-list'"` MergeByDirectory bool `help:"Instead of relying on identification, merge contexts and columns by base directory. Very useful when dealing with many small logs organized per directories."` - List list `cmd:""` - Whois whois `cmd:""` - Sed sed `cmd:""` + List list `cmd:""` + //Whois whois `cmd:""` + // Sed sed `cmd:""` Ctx ctx `cmd:""` RegexList regexList `cmd:""` Conflicts conflicts `cmd:""` diff --git a/src/go/pt-galera-log-explainer/sed.go b/src/go/pt-galera-log-explainer/sed.go index 3476f5ee..5de8fb3b 100644 --- a/src/go/pt-galera-log-explainer/sed.go +++ b/src/go/pt-galera-log-explainer/sed.go @@ -1,16 +1,6 @@ package main -import ( - "fmt" - "os" - "os/exec" - "strings" - - "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/regex" - "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/types" - "github.com/pkg/errors" -) - +/* type sed struct { Paths []string `arg:"" name:"paths" help:"paths of the log to use"` ByIP bool `help:"Replace by IP instead of name"` @@ -109,3 +99,4 @@ func sedSliceWith(elems []string, replace string) []string { } return args } +*/ diff --git a/src/go/pt-galera-log-explainer/whois.go b/src/go/pt-galera-log-explainer/whois.go index 22b3d757..35349b7c 100644 --- a/src/go/pt-galera-log-explainer/whois.go +++ b/src/go/pt-galera-log-explainer/whois.go @@ -1,14 +1,6 @@ package main -import ( - "encoding/json" - "fmt" - - "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/regex" - "github.com/percona/percona-toolkit/src/go/pt-galera-log-explainer/types" - "github.com/pkg/errors" -) - +/* type whois struct { Search string `arg:"" name:"search" help:"the identifier (node name, ip, uuid, hash) to search"` Paths []string `arg:"" name:"paths" help:"paths of the log to use"` @@ -16,7 +8,7 @@ type whois struct { func (w *whois) Help() string { return `Take any type of info pasted from error logs and find out about it. -It will list known node name(s), IP(s), hostname(s), and other known node's UUIDs. +It will list known node name(s), IP(s), hostname(s), and other known node's UUIDs. ` } @@ -40,7 +32,6 @@ func (w *whois) Run() error { } func whoIs(ctxs map[string]types.LogCtx, search string) types.NodeInfo { - /* ni := types.NodeInfo{Input: search} if regex.IsNodeUUID(search) { search = utils.UUIDToShortUUID(search) @@ -98,6 +89,6 @@ func whoIs(ctxs map[string]types.LogCtx, search string) types.NodeInfo { ni.NodeUUIDs = hashes ni.IPs = ips return ni - */ return types.NodeInfo{} } +*/