From ff7aa194aaff3de8a55ebf51964aa64c3b4d47f7 Mon Sep 17 00:00:00 2001 From: loveuer Date: Tue, 26 Mar 2024 17:23:10 +0800 Subject: [PATCH] update: add write mapping,setting info msg, go module name --- go.mod | 2 +- internal/cmd/cmd.go | 3 ++- internal/cmd/run.go | 30 +++++++++++++++++++++--------- internal/xes/xes.go | 15 ++++++++------- internal/xes/xes_test.go | 5 +++-- internal/xfile/xfile.go | 5 +++-- main.go | 3 ++- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index f54cc7d..1726470 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module esgo2dump +module github.com/loveuer/esgo2dump go 1.18 diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 818f573..e1b0f2b 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -2,7 +2,8 @@ package cmd import ( "context" - "esgo2dump/internal/opt" + + "github.com/loveuer/esgo2dump/internal/opt" "github.com/spf13/cobra" ) diff --git a/internal/cmd/run.go b/internal/cmd/run.go index 2d75757..d5cb31f 100644 --- a/internal/cmd/run.go +++ b/internal/cmd/run.go @@ -4,16 +4,17 @@ import ( "context" "encoding/json" "errors" - "esgo2dump/internal/interfaces" - "esgo2dump/internal/opt" - "esgo2dump/internal/xes" - "esgo2dump/internal/xfile" "fmt" - "github.com/sirupsen/logrus" - "github.com/spf13/cobra" "io" "net/url" "os" + + "github.com/loveuer/esgo2dump/internal/interfaces" + "github.com/loveuer/esgo2dump/internal/opt" + "github.com/loveuer/esgo2dump/internal/xes" + "github.com/loveuer/esgo2dump/internal/xfile" + "github.com/sirupsen/logrus" + "github.com/spf13/cobra" ) func run(cmd *cobra.Command, args []string) error { @@ -55,14 +56,26 @@ func run(cmd *cobra.Command, args []string) error { return err } - return ioo.WriteMapping(cmd.Context(), mapping) + if err = ioo.WriteMapping(cmd.Context(), mapping); err != nil { + return err + } + + logrus.Info("Dump: write mapping succeed!!!") + + return nil case "setting": var setting map[string]any if setting, err = ioi.ReadSetting(cmd.Context()); err != nil { return err } - return ioo.WriteSetting(cmd.Context(), setting) + if err = ioo.WriteSetting(cmd.Context(), setting); err != nil { + return err + } + + logrus.Info("Dump: write setting succeed!!!") + + return nil default: return fmt.Errorf("unknown type=%s", f_type) } @@ -98,7 +111,6 @@ func executeData(ctx context.Context, input, output interfaces.DumpIO) error { } logrus.Infof("Dump: %d docs succeed!!!", succeed) - } } diff --git a/internal/xes/xes.go b/internal/xes/xes.go index 1938227..c36d8b0 100644 --- a/internal/xes/xes.go +++ b/internal/xes/xes.go @@ -5,19 +5,20 @@ import ( "context" "crypto/tls" "encoding/json" - "esgo2dump/internal/interfaces" - "esgo2dump/internal/opt" - "esgo2dump/internal/util" "fmt" - elastic "github.com/elastic/go-elasticsearch/v7" - "github.com/elastic/go-elasticsearch/v7/esapi" - "github.com/elastic/go-elasticsearch/v7/esutil" - "github.com/sirupsen/logrus" "net" "net/http" "net/url" "strings" "time" + + elastic "github.com/elastic/go-elasticsearch/v7" + "github.com/elastic/go-elasticsearch/v7/esapi" + "github.com/elastic/go-elasticsearch/v7/esutil" + "github.com/loveuer/esgo2dump/internal/interfaces" + "github.com/loveuer/esgo2dump/internal/opt" + "github.com/loveuer/esgo2dump/internal/util" + "github.com/sirupsen/logrus" ) func NewClient(url *url.URL, iot interfaces.IO, qm map[string]any) (interfaces.DumpIO, error) { diff --git a/internal/xes/xes_test.go b/internal/xes/xes_test.go index 32e04f8..a63a75d 100644 --- a/internal/xes/xes_test.go +++ b/internal/xes/xes_test.go @@ -1,9 +1,10 @@ package xes import ( - "esgo2dump/internal/util" - elastic "github.com/elastic/go-elasticsearch/v7" "testing" + + elastic "github.com/elastic/go-elasticsearch/v7" + "github.com/loveuer/esgo2dump/internal/util" ) func TestGetESMapping(t *testing.T) { diff --git a/internal/xfile/xfile.go b/internal/xfile/xfile.go index e996ec2..004c3ba 100644 --- a/internal/xfile/xfile.go +++ b/internal/xfile/xfile.go @@ -4,10 +4,11 @@ import ( "bufio" "context" "encoding/json" - "esgo2dump/internal/interfaces" - "github.com/sirupsen/logrus" "io" "os" + + "github.com/loveuer/esgo2dump/internal/interfaces" + "github.com/sirupsen/logrus" ) type client struct { diff --git a/main.go b/main.go index fb2f7d4..1be1c42 100644 --- a/main.go +++ b/main.go @@ -2,10 +2,11 @@ package main import ( "context" - "esgo2dump/internal/cmd" "os/signal" "syscall" + "github.com/loveuer/esgo2dump/internal/cmd" + "github.com/sirupsen/logrus" )