Do not log nil error in bulk indexer (#574) (#578)

Anaethelion · rockdaboot · web-flow · commit 03041fcb2c87 · 2022-12-27T12:16:40.000+01:00
Co-authored-by: Tim Rühsen &lt;tim.ruehsen@gmx.de&gt;
diff --git a/esutil/bulk_indexer.go b/esutil/bulk_indexer.go
@@ -610,7 +610,7 @@ func (w *worker) flush(ctx context.Context) error {
 		atomic.AddUint64(&w.bi.stats.numFailed, uint64(len(w.items)))
 		// TODO(karmi): Wrap error (include response struct)
 		if w.bi.config.OnError != nil {
-			w.bi.config.OnError(ctx, fmt.Errorf("flush: %s", err))
+			w.bi.config.OnError(ctx, fmt.Errorf("flush: %s", res.String()))
 		}
 		return fmt.Errorf("flush: %s", res.String())
 	}

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ func (w *worker) flush(ctx context.Context) error {`
`610`	`610`	`atomic.AddUint64(&w.bi.stats.numFailed, uint64(len(w.items)))`
`611`	`611`	`// TODO(karmi): Wrap error (include response struct)`
`612`	`612`	`if w.bi.config.OnError != nil {`
`613`		`- w.bi.config.OnError(ctx, fmt.Errorf("flush: %s", err))`
	`613`	`+ w.bi.config.OnError(ctx, fmt.Errorf("flush: %s", res.String()))`
`614`	`614`	`}`
`615`	`615`	`return fmt.Errorf("flush: %s", res.String())`
`616`	`616`	`}`