unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

rename stuff per feedback

Browse Source
This commit is contained in:
magodo
2019-06-25 22:41:31 +08:00
parent 8e4fd16aff
commit a8dbca756c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/source/consul/consul.go
View File

@@ -75,7 +75,7 @@ func NewSource(opts ...source.Option) source.Source {
config := api.DefaultConfig() config := api.DefaultConfig()
// use the consul config passed in the options if any // use the consul config passed in the options if any
if co, ok := options.Context.Value(consulConfigKey{}).(*api.Config); ok { if co, ok := options.Context.Value(configKey{}).(*api.Config); ok {
config = co config = co
} }

8
config/source/consul/options.go
View File

@@ -12,7 +12,7 @@ type prefixKey struct{}
type stripPrefixKey struct{} type stripPrefixKey struct{}
type dcKey struct{} type dcKey struct{}
type tokenKey struct{} type tokenKey struct{}
type consulConfigKey struct{} type configKey struct{}
// WithAddress sets the consul address // WithAddress sets the consul address
func WithAddress(a string) source.Option { func WithAddress(a string) source.Option {
@@ -64,12 +64,12 @@ func WithToken(p string) source.Option {
} }
} }
// WithConsulConfig set consul-specific options // WithConfig set consul-specific options
func WithConsulConfig(c *api.Config) source.Option { func WithConfig(c *api.Config) source.Option {
return func(o *source.Options) { return func(o *source.Options) {
if o.Context == nil { if o.Context == nil {
o.Context = context.Background() o.Context = context.Background()
} }
o.Context = context.WithValue(o.Context, consulConfigKey{}, c) o.Context = context.WithValue(o.Context, configKey{}, c)
} }
} }