MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-04 10:26:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: make sure esClient is allocated before use (#13727)

Browse Source
This commit is contained in:
Harshavardhana 2021-11-22 12:46:46 -08:00 committed by GitHub
parent 28f95f1fbe
commit 08f4a0a816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/event/target/elasticsearch.go
View File

@ -179,6 +179,7 @@ func (target *ElasticsearchTarget) IsActive() (bool, error) {
if err != nil { if err != nil {
return false, err return false, err
} }
return target.client.ping(ctx, target.args) return target.client.ping(ctx, target.args)
} }
@ -187,7 +188,16 @@ func (target *ElasticsearchTarget) Save(eventData event.Event) error {
if target.store != nil { if target.store != nil {
return target.store.Put(eventData) return target.store.Put(eventData)
} }
err := target.send(eventData)
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
err := target.checkAndInitClient(ctx)
if err != nil {
return err
}
err = target.send(eventData)
if xnet.IsNetworkOrHostDown(err, false) { if xnet.IsNetworkOrHostDown(err, false) {
return errNotConnected return errNotConnected
} }