beater: address review

axw · axw · commit 5084eba6c929 · 2021-10-11T15:59:08.000+08:00
diff --git a/beater/beater.go b/beater/beater.go
@@ -664,11 +664,9 @@ func (s *serverRunner) newFinalBatchProcessor(p *publish.Publisher) (model.Batch
 	}
 	esConfig.FlushInterval = time.Second
 
-	if esOutputConfig != nil {
-		esConfig.Config = elasticsearch.DefaultConfig()
-		if err := esOutputConfig.Unpack(&esConfig); err != nil {
-			return nil, err
-		}
+	esConfig.Config = elasticsearch.DefaultConfig()
+	if err := esOutputConfig.Unpack(&esConfig); err != nil {
+		return nil, err
 	}
 	if !esConfig.Experimental {
 		return p, nil

Original file line number	Diff line number	Diff line change
`@@ -664,11 +664,9 @@ func (s serverRunner) newFinalBatchProcessor(p publish.Publisher) (model.Batch`
`664`	`664`	`}`
`665`	`665`	`esConfig.FlushInterval = time.Second`
`666`	`666`
`667`		`- if esOutputConfig != nil {`
`668`		`- esConfig.Config = elasticsearch.DefaultConfig()`
`669`		`- if err := esOutputConfig.Unpack(&esConfig); err != nil {`
`670`		`- return nil, err`
`671`		`- }`
	`667`	`+ esConfig.Config = elasticsearch.DefaultConfig()`
	`668`	`+ if err := esOutputConfig.Unpack(&esConfig); err != nil {`
	`669`	`+ return nil, err`
`672`	`670`	`}`
`673`	`671`	`if !esConfig.Experimental {`
`674`	`672`	`return p, nil`