Skip to content

Commit

Permalink
revert fixing typo
Browse files Browse the repository at this point in the history
  • Loading branch information
ofekshenawa committed Feb 20, 2024
1 parent d1e44ad commit d261838
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions bench_decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func NewClientStub(resp []byte) *ClientStub {
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
return stub.stubConn(initHello), nil
},
DisableIdentity: true,
DisableIndentity: true,
})
return stub
}
Expand All @@ -46,7 +46,7 @@ func NewClusterClientStub(resp []byte) *ClientStub {
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
return stub.stubConn(initHello), nil
},
DisableIdentity: true,
DisableIndentity: true,

ClusterSlots: func(_ context.Context) ([]ClusterSlot, error) {
return []ClusterSlot{
Expand Down
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ type Options struct {
readOnly bool

// Disable set-lib on connect. Default is false.
DisableIdentity bool
DisableIndentity bool

// Add suffix to client name. Default is empty.
IdentitySuffix string
Expand Down
26 changes: 13 additions & 13 deletions osscluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ type ClusterOptions struct {
ConnMaxIdleTime time.Duration
ConnMaxLifetime time.Duration

TLSConfig *tls.Config
DisableIdentity bool // Disable set-lib on connect. Default is false.
TLSConfig *tls.Config
DisableIndentity bool // Disable set-lib on connect. Default is false.

IdentitySuffix string // Add suffix to client name. Default is empty.
}
Expand Down Expand Up @@ -286,17 +286,17 @@ func (opt *ClusterOptions) clientOptions() *Options {
WriteTimeout: opt.WriteTimeout,
ContextTimeoutEnabled: opt.ContextTimeoutEnabled,

PoolFIFO: opt.PoolFIFO,
PoolSize: opt.PoolSize,
PoolTimeout: opt.PoolTimeout,
MinIdleConns: opt.MinIdleConns,
MaxIdleConns: opt.MaxIdleConns,
MaxActiveConns: opt.MaxActiveConns,
ConnMaxIdleTime: opt.ConnMaxIdleTime,
ConnMaxLifetime: opt.ConnMaxLifetime,
DisableIdentity: opt.DisableIdentity,
IdentitySuffix: opt.IdentitySuffix,
TLSConfig: opt.TLSConfig,
PoolFIFO: opt.PoolFIFO,
PoolSize: opt.PoolSize,
PoolTimeout: opt.PoolTimeout,
MinIdleConns: opt.MinIdleConns,
MaxIdleConns: opt.MaxIdleConns,
MaxActiveConns: opt.MaxActiveConns,
ConnMaxIdleTime: opt.ConnMaxIdleTime,
ConnMaxLifetime: opt.ConnMaxLifetime,
DisableIndentity: opt.DisableIndentity,
IdentitySuffix: opt.IdentitySuffix,
TLSConfig: opt.TLSConfig,
// If ClusterSlots is populated, then we probably have an artificial
// cluster whose nodes are not in clustering mode (otherwise there isn't
// much use for ClusterSlots config). This means we cannot execute the
Expand Down
2 changes: 1 addition & 1 deletion redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
return err
}

if !c.opt.DisableIdentity {
if !c.opt.DisableIndentity {
libName := ""
libVer := Version()
if c.opt.IdentitySuffix != "" {
Expand Down
8 changes: 4 additions & 4 deletions ring.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ type RingOptions struct {
TLSConfig *tls.Config
Limiter Limiter

DisableIdentity bool
IdentitySuffix string
DisableIndentity bool
IdentitySuffix string
}

func (opt *RingOptions) init() {
Expand Down Expand Up @@ -166,8 +166,8 @@ func (opt *RingOptions) clientOptions() *Options {
TLSConfig: opt.TLSConfig,
Limiter: opt.Limiter,

DisableIdentity: opt.DisableIdentity,
IdentitySuffix: opt.IdentitySuffix,
DisableIndentity: opt.DisableIndentity,
IdentitySuffix: opt.IdentitySuffix,
}
}

Expand Down
8 changes: 4 additions & 4 deletions sentinel.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ type FailoverOptions struct {

TLSConfig *tls.Config

DisableIdentity bool
IdentitySuffix string
DisableIndentity bool
IdentitySuffix string
}

func (opt *FailoverOptions) clientOptions() *Options {
Expand Down Expand Up @@ -117,8 +117,8 @@ func (opt *FailoverOptions) clientOptions() *Options {

TLSConfig: opt.TLSConfig,

DisableIdentity: opt.DisableIdentity,
IdentitySuffix: opt.IdentitySuffix,
DisableIndentity: opt.DisableIndentity,
IdentitySuffix: opt.IdentitySuffix,
}
}

Expand Down
16 changes: 8 additions & 8 deletions universal.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ type UniversalOptions struct {

MasterName string

DisableIdentity bool
IdentitySuffix string
DisableIndentity bool
IdentitySuffix string
}

// Cluster returns cluster options created from the universal options.
Expand Down Expand Up @@ -112,8 +112,8 @@ func (o *UniversalOptions) Cluster() *ClusterOptions {

TLSConfig: o.TLSConfig,

DisableIdentity: o.DisableIdentity,
IdentitySuffix: o.IdentitySuffix,
DisableIndentity: o.DisableIndentity,
IdentitySuffix: o.IdentitySuffix,
}
}

Expand Down Expand Up @@ -158,8 +158,8 @@ func (o *UniversalOptions) Failover() *FailoverOptions {

TLSConfig: o.TLSConfig,

DisableIdentity: o.DisableIdentity,
IdentitySuffix: o.IdentitySuffix,
DisableIndentity: o.DisableIndentity,
IdentitySuffix: o.IdentitySuffix,
}
}

Expand Down Expand Up @@ -201,8 +201,8 @@ func (o *UniversalOptions) Simple() *Options {

TLSConfig: o.TLSConfig,

DisableIdentity: o.DisableIdentity,
IdentitySuffix: o.IdentitySuffix,
DisableIndentity: o.DisableIndentity,
IdentitySuffix: o.IdentitySuffix,
}
}

Expand Down

0 comments on commit d261838

Please sign in to comment.