MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 07:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix panic when checking if es/nats event target is active (#9587)

Browse Source
This commit is contained in:
poornas 2020-05-13 06:37:22 -07:00 committed by GitHub
parent 94f1a1dea3
commit 2ecf5ba1de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/event/target/elasticsearch.go
View File

@ -103,6 +103,13 @@ func (target *ElasticsearchTarget) IsActive() (bool, error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
if target.client == nil {
client, err := newClient(target.args)
if err != nil {
return false, err
}
target.client = client
}
_, code, err := target.client.Ping(target.args.URL.String()).HttpHeadOnly(true).Do(ctx) _, code, err := target.client.Ping(target.args.URL.String()).HttpHeadOnly(true).Do(ctx)
if err != nil { if err != nil {
if elastic.IsConnErr(err) || elastic.IsContextErr(err) || xnet.IsNetworkOrHostDown(err) { if elastic.IsConnErr(err) || elastic.IsContextErr(err) || xnet.IsNetworkOrHostDown(err) {

2
pkg/event/target/nsq.go
View File

@ -106,7 +106,7 @@ func (target *NSQTarget) HasQueueStore() bool {
// IsActive - Return true if target is up and active // IsActive - Return true if target is up and active
func (target *NSQTarget) IsActive() (bool, error) { func (target *NSQTarget) IsActive() (bool, error) {
if target.producer != nil { if target.producer == nil {
producer, err := nsq.NewProducer(target.args.NSQDAddress.String(), target.config) producer, err := nsq.NewProducer(target.args.NSQDAddress.String(), target.config)
if err != nil { if err != nil {
return false, err return false, err