diff --git a/go.mod b/go.mod index a9743c3..f304069 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/elastic/go-elasticsearch/v7 v7.17.10 github.com/fatih/color v1.16.0 github.com/samber/lo v1.39.0 - github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 ) @@ -16,7 +15,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.8.4 // indirect golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect golang.org/x/sys v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index a9c2fd8..91785a5 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,4 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/elastic/go-elasticsearch/v6 v6.8.10 h1:2lN0gJ93gMBXvkhwih5xquldszpm8FlUwqG5sPzr6a8= github.com/elastic/go-elasticsearch/v6 v6.8.10/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= @@ -15,29 +12,18 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/cmd/run.go b/internal/cmd/run.go index 614bc7d..0e8fc60 100644 --- a/internal/cmd/run.go +++ b/internal/cmd/run.go @@ -17,7 +17,6 @@ import ( "github.com/loveuer/esgo2dump/internal/xes" "github.com/loveuer/esgo2dump/internal/xfile" "github.com/samber/lo" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -52,9 +51,7 @@ func run(cmd *cobra.Command, args []string) error { ) if opt.Debug { - logrus.SetLevel(logrus.DebugLevel) - logrus.SetReportCaller(true) - logrus.SetFormatter(&logrus.JSONFormatter{}) + log.SetLogLevel(log.LogLevelDebug) } if f_version { @@ -247,50 +244,26 @@ func newIO(source string, ioType interfaces.IO, esv string) (interfaces.DumpIO, qm = make(map[string]any) ) - logrus. - WithField("action", "new_io"). - WithField("type", ioType.Code()). - WithField("source", source). - WithField("es_version", esv). - Debug() + log.Debug("action=%s, type=%s, source=%s, es_version=%s", "new_io", ioType.Code(), source, esv) if iurl, err = url.Parse(source); err != nil { - logrus. - WithField("action", "new_io url parse error"). - WithField("type", ioType.Code()). - WithField("source", source). - WithField("err", err). - Debug() + log.Debug("action=%s, type=%s, source=%s, err=%s", "new_io url parse err", ioType.Code(), source, err.Error()) goto ClientByFile } if !(iurl.Scheme == "http" || iurl.Scheme == "https") { - logrus. - WithField("action", "new_io url scheme error"). - WithField("type", ioType.Code()). - WithField("source", source). - WithField("scheme", iurl.Scheme). - Debug() + log.Debug("action=%s, type=%s, source=%s, scheme=%s", "new_io url scheme error", ioType.Code(), source, iurl.Scheme) goto ClientByFile } if iurl.Host == "" { - logrus. - WithField("action", "new_io url host empty"). - WithField("type", ioType.Code()). - WithField("source", source). - Debug() + log.Debug("action=%s, type=%s, source=%s", "new_io url host empty", ioType.Code(), source) goto ClientByFile } if ioType == interfaces.IOInput && f_query != "" { if err = json.Unmarshal([]byte(f_query), &qm); err != nil { - logrus. - WithField("action", "new_io query string invalid"). - WithField("type", ioType.Code()). - WithField("source", source). - WithField("query", f_query). - Debug() + log.Debug("action=%s, type=%s, source=%s, query=%s", "new_io query string invalid", ioType.Code(), source, f_query) return nil, fmt.Errorf("invalid query err=%v", err) } } diff --git a/internal/xes/xes6.go b/internal/xes/xes6.go index be0865d..6d1cd2c 100644 --- a/internal/xes/xes6.go +++ b/internal/xes/xes6.go @@ -20,7 +20,6 @@ import ( "github.com/loveuer/esgo2dump/internal/interfaces" "github.com/loveuer/esgo2dump/internal/opt" "github.com/loveuer/esgo2dump/internal/util" - "github.com/sirupsen/logrus" ) func NewClientV6(url *url.URL, iot interfaces.IO) (interfaces.DumpIO, error) { @@ -41,13 +40,7 @@ func NewClientV6(url *url.URL, iot interfaces.IO) (interfaces.DumpIO, error) { } } - logrus. - WithField("action", "new es client v6"). - WithField("endpoint", address). - WithField("index", urlIndex). - WithField("username", urlUsername). - WithField("password", urlPassword). - Debug() + log.Debug("action=%s, endpoint=%s, index=%s, username=%s, password=%s", "new es client v6", address, urlIndex, urlUsername, urlPassword) if urlIndex == "" { return nil, fmt.Errorf("please specify index name: (like => http://127.0.0.1:9200/my_index)") @@ -75,30 +68,20 @@ func NewClientV6(url *url.URL, iot interfaces.IO) (interfaces.DumpIO, error) { }, }, ); err != nil { - logrus. - WithField("action", "new es client v6 error"). - WithField("endpoints", endpoints). - WithField("err", err). - Debug() + log.Debug("action=%s, endpoints=%v, err=%s", "new es client v6 error", endpoints, err.Error()) errCh <- err return } if infoResp, err = cli.Info(); err != nil { - logrus. - WithField("action", "es client v6 ping error"). - WithField("err", err). - Debug() + log.Debug("action=%s, endpoints=%v, err=%s", "new es client v6 info error", endpoints, err.Error()) errCh <- err return } if infoResp.StatusCode != 200 { err = fmt.Errorf("info xes status=%d", infoResp.StatusCode) - logrus. - WithField("action", "es client v6 ping status error"). - WithField("status", infoResp.StatusCode). - Debug() + log.Debug("action=%s, endpoints=%v, err=%s", "es client v6 ping status error", endpoints, err.Error()) errCh <- err return } diff --git a/log/default.go b/log/default.go index 840d1af..3045e17 100644 --- a/log/default.go +++ b/log/default.go @@ -24,9 +24,6 @@ var ( } ) -func init() { -} - func SetTimeFormat(format string) { defaultLogger.SetTimeFormat(format) } @@ -34,3 +31,18 @@ func SetTimeFormat(format string) { func SetLogLevel(level LogLevel) { defaultLogger.SetLogLevel(level) } + +func Debug(msg string, data ...any) { + defaultLogger.Debug(msg, data...) +} +func Info(msg string, data ...any) { + defaultLogger.Info(msg, data...) +} + +func Warn(msg string, data ...any) { + defaultLogger.Warn(msg, data...) +} + +func Error(msg string, data ...any) { + defaultLogger.Error(msg, data...) +} diff --git a/log/log.go b/log/log.go index 975b68a..11bae63 100644 --- a/log/log.go +++ b/log/log.go @@ -85,21 +85,6 @@ func (l *logger) Error(msg string, data ...any) { l.error(red.Sprint("Error "), time.Now().Format(l.timeFormat), msg, data...) } -func Debug(msg string, data ...any) { - defaultLogger.Debug(msg, data...) -} -func Info(msg string, data ...any) { - defaultLogger.Info(msg, data...) -} - -func Warn(msg string, data ...any) { - defaultLogger.Warn(msg, data...) -} - -func Error(msg string, data ...any) { - defaultLogger.Error(msg, data...) -} - type WroteLogger interface { Info(msg string, data ...any) }