Skip to content
Snippets Groups Projects
Unverified Commit c6c39e2d authored by Xin.Zh's avatar Xin.Zh Committed by GitHub
Browse files

Merge pull request #654 from JiaLiangoooo/develop

Fix: panic when checkRegistries
parents cd3d3a2b f15150fc
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ type ConsumerConfig struct { ...@@ -47,7 +47,7 @@ type ConsumerConfig struct {
ConnectTimeout time.Duration ConnectTimeout time.Duration
Registry *RegistryConfig `yaml:"registry" json:"registry,omitempty" property:"registry"` 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"` Request_Timeout string `yaml:"request_timeout" default:"5s" json:"request_timeout,omitempty" property:"request_timeout"`
RequestTimeout time.Duration RequestTimeout time.Duration
......
...@@ -48,7 +48,7 @@ type ProviderConfig struct { ...@@ -48,7 +48,7 @@ type ProviderConfig struct {
ConfigType map[string]string `yaml:"config_type" json:"config_type,omitempty" property:"config_type"` ConfigType map[string]string `yaml:"config_type" json:"config_type,omitempty" property:"config_type"`
Registry *RegistryConfig `yaml:"registry" json:"registry,omitempty" property:"registry"` 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 // UnmarshalYAML unmarshals the ProviderConfig by @unmarshal function
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment