Skip to content

Commit

Permalink
Merge pull request #654 from JiaLiangoooo/develop
Browse files Browse the repository at this point in the history
Fix: panic when checkRegistries
  • Loading branch information
AlexStocks authored Jul 15, 2020
2 parents a5e8cb8 + 023845b commit 8e409f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config/consumer_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type ConsumerConfig struct {
ConnectTimeout time.Duration

Registry *RegistryConfig `yaml:"registry" json:"registry,omitempty" property:"registry"`
Registries map[string]*RegistryConfig `yaml:"registries" json:"registries,omitempty" property:"registries"`
Registries map[string]*RegistryConfig `default:"{}" yaml:"registries" json:"registries" property:"registries"`

Request_Timeout string `yaml:"request_timeout" default:"5s" json:"request_timeout,omitempty" property:"request_timeout"`
RequestTimeout time.Duration
Expand Down
2 changes: 1 addition & 1 deletion config/provider_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type ProviderConfig struct {
ConfigType map[string]string `yaml:"config_type" json:"config_type,omitempty" property:"config_type"`

Registry *RegistryConfig `yaml:"registry" json:"registry,omitempty" property:"registry"`
Registries map[string]*RegistryConfig `yaml:"registries" json:"registries,omitempty" property:"registries"`
Registries map[string]*RegistryConfig `default:"{}" yaml:"registries" json:"registries" property:"registries"`
}

// UnmarshalYAML unmarshals the ProviderConfig by @unmarshal function
Expand Down

0 comments on commit 8e409f5

Please sign in to comment.