update: more msg

v0.0.3 beta

go.mod

@@ -1,4 +1,4 @@
-module esgo2dump
+module github.com/loveuer/esgo2dump
 
 go 1.18
 

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"
 )
 

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 {
@@ -27,6 +28,10 @@ func run(cmd *cobra.Command, args []string) error {
 		logrus.SetLevel(logrus.DebugLevel)
 	}
 
+	if f_limit == 0 || f_limit > 10000 {
+		return fmt.Errorf("invalid limit(1 - 10000)")
+	}
+
 	switch f_type {
 	case "data", "mapping", "setting":
 	default:
@@ -85,6 +90,7 @@ func executeData(ctx context.Context, input, output interfaces.DumpIO) error {
 		err     error
 		lines   []*interfaces.ESSource
 		succeed int
+		total   int
 	)
 
 	for {
@@ -109,7 +115,9 @@ func executeData(ctx context.Context, input, output interfaces.DumpIO) error {
 			return fmt.Errorf("cmd.run: got lines=%d, only succeed=%d", len(lines), succeed)
 		}
 
-		logrus.Infof("Dump: %d docs succeed!!!", succeed)
+		total += succeed
+
+		logrus.Infof("Dump: succeed=%d total=%d docs succeed!!!", succeed, total)
 	}
 }
 

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) {
@@ -110,6 +111,7 @@ func (c *client) WriteData(ctx context.Context, docs []*interfaces.ESSource) (in
 		err     error
 		indexer esutil.BulkIndexer
 		count   int
+		be      error
 	)
 	if indexer, err = esutil.NewBulkIndexer(esutil.BulkIndexerConfig{
 		Client:  c.c,
@@ -133,6 +135,9 @@ func (c *client) WriteData(ctx context.Context, docs []*interfaces.ESSource) (in
 			Index:      c.index,
 			DocumentID: doc.DocId,
 			Body:       bytes.NewReader(bs),
+			OnFailure: func(ctx context.Context, item esutil.BulkIndexerItem, item2 esutil.BulkIndexerResponseItem, bulkErr error) {
+				be = bulkErr
+			},
 		}); err != nil {
 			return 0, err
 		}
@@ -143,9 +148,13 @@ func (c *client) WriteData(ctx context.Context, docs []*interfaces.ESSource) (in
 		return 0, err
 	}
 
+	if be != nil {
+		return 0, be
+	}
+
 	stats := indexer.Stats()
 	if stats.NumFailed > 0 {
-		return count, fmt.Errorf("write to xes failed=%d", stats.NumFailed)
+		return count, fmt.Errorf("write to xes failed_count=%d bulk_count=%d", stats.NumFailed, count)
 	}
 
 	return count, nil

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) {

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 {

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"
 )