Skip to content

Commit

Permalink
Merge branch 'master' into feat/add_object_fraq_command
Browse files Browse the repository at this point in the history
  • Loading branch information
ofekshenawa committed Feb 14, 2024
2 parents bc312a7 + f0ecdb4 commit 9d442f1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ key value NoSQL database that uses RocksDB as storage engine and is compatible w

## Features

- Redis 3 commands except QUIT, MONITOR, and SYNC.
- Automatic connection pooling with
- Redis commands except QUIT and SYNC.
- Automatic connection pooling.
- [Pub/Sub](https://redis.uptrace.dev/guide/go-redis-pubsub.html).
- [Pipelines and transactions](https://redis.uptrace.dev/guide/go-redis-pipelines.html).
- [Scripting](https://redis.uptrace.dev/guide/lua-scripting.html).
Expand Down
14 changes: 8 additions & 6 deletions osscluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ type ClusterOptions struct {

OnConnect func(ctx context.Context, cn *Conn) error

Protocol int
Username string
Password string
Protocol int
Username string
Password string
CredentialsProvider func() (username string, password string)

MaxRetries int
MinRetryBackoff time.Duration
Expand Down Expand Up @@ -271,9 +272,10 @@ func (opt *ClusterOptions) clientOptions() *Options {
Dialer: opt.Dialer,
OnConnect: opt.OnConnect,

Protocol: opt.Protocol,
Username: opt.Username,
Password: opt.Password,
Protocol: opt.Protocol,
Username: opt.Username,
Password: opt.Password,
CredentialsProvider: opt.CredentialsProvider,

MaxRetries: opt.MaxRetries,
MinRetryBackoff: opt.MinRetryBackoff,
Expand Down

0 comments on commit 9d442f1

Please sign in to comment.