-
Notifications
You must be signed in to change notification settings - Fork 411
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: XinTong Zhou <[email protected]>
- Loading branch information
Showing
5 changed files
with
36 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright 2023-2023 [email protected] | ||
| // Copyright 2023-2024 [email protected] | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
|
|
@@ -15,6 +15,7 @@ | |
| package pubsub | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/redis/go-redis/v9" | ||
|
|
@@ -67,6 +68,22 @@ func (r *redisPub) Validate(props map[string]interface{}) error { | |
| return nil | ||
| } | ||
|
|
||
| func (r *redisPub) Ping(_ string, props map[string]interface{}) error { | ||
| if err := r.Configure(props); err != nil { | ||
| return err | ||
| } | ||
| r.conn = redis.NewClient(&redis.Options{ | ||
| Addr: r.conf.Address, | ||
| Username: r.conf.Username, | ||
| Password: r.conf.Password, | ||
| DB: r.conf.Db, | ||
| }) | ||
| if err := r.conn.Ping(context.Background()).Err(); err != nil { | ||
| return fmt.Errorf("Ping Redis failed with error: %v", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (r *redisPub) Configure(props map[string]interface{}) error { | ||
| return r.Validate(props) | ||
| } | ||
|
|
@@ -79,11 +96,6 @@ func (r *redisPub) Open(ctx api.StreamContext) error { | |
| Password: r.conf.Password, | ||
| DB: r.conf.Db, | ||
| }) | ||
| // Ping Redis to check if the connection is alive | ||
| err := r.conn.Ping(ctx).Err() | ||
| if err != nil { | ||
| return fmt.Errorf("Ping Redis failed with error: %v", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright 2023-2023 [email protected] | ||
| // Copyright 2023-2024 EMQ Technologies Co., Ltd. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
|
|
@@ -26,6 +26,7 @@ import ( | |
|
|
||
| "github.com/lf-edge/ekuiper/internal/io/mock" | ||
| mockContext "github.com/lf-edge/ekuiper/internal/io/mock/context" | ||
| "github.com/lf-edge/ekuiper/internal/pkg/util" | ||
| "github.com/lf-edge/ekuiper/pkg/errorx" | ||
| ) | ||
|
|
||
|
|
@@ -170,19 +171,14 @@ func TestSinkDecompressorError(t *testing.T) { | |
| } | ||
|
|
||
| func TestSinkPingRedisError(t *testing.T) { | ||
| s := RedisPub() | ||
| s := RedisPub().(util.PingableConn) | ||
| prop := map[string]interface{}{ | ||
| "address": "127.0.0.1:6379", | ||
| "db": 0, | ||
| "channel": DefaultChannel, | ||
| } | ||
| expErrStr := fmt.Sprintf("Ping Redis failed with error") | ||
| err := s.Configure(prop) | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| ctx := mockContext.NewMockContext("ruleSink", "op1") | ||
| err = s.Open(ctx) | ||
| err := s.Ping("", prop) | ||
| if err == nil { | ||
| t.Errorf("should have error") | ||
| return | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| // Copyright 2023-2023 [email protected] | ||
| // Copyright 2023-2024 [email protected] | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
|
|
@@ -72,18 +72,20 @@ func (r *redisSub) Validate(props map[string]interface{}) error { | |
| return nil | ||
| } | ||
|
|
||
| func (r *redisSub) Configure(_ string, props map[string]interface{}) error { | ||
| if err := r.Validate(props); err != nil { | ||
| func (r *redisSub) Ping(dataSource string, props map[string]interface{}) error { | ||
| if err := r.Configure(dataSource, props); err != nil { | ||
| return err | ||
| } | ||
| // Ping Redis to check if the connection is alive | ||
| err := r.conn.Ping(context.Background()).Err() | ||
| if err != nil { | ||
| if err := r.conn.Ping(context.Background()).Err(); err != nil { | ||
| return fmt.Errorf("Ping Redis failed with error: %v", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (r *redisSub) Configure(_ string, props map[string]interface{}) error { | ||
| return r.Validate(props) | ||
| } | ||
|
|
||
| func (r *redisSub) Open(ctx api.StreamContext, consumer chan<- api.SourceTuple, errCh chan<- error) { | ||
| logger := ctx.GetLogger() | ||
| logger.Infof("redisSub sink Opening") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters