admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix servicemesh options nil bug

Browse Source
This commit is contained in:
Jeff
2019-09-25 01:16:13 +08:00
committed by zryfish
parent 284c0d6425
commit d0dc66cf28
16 changed files with 48 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/simple/client/elasticsearch/options.go
View File

@@ -6,12 +6,12 @@ import (
)
type ElasticSearchOptions struct {
Host string `json:"host,omitempty" yaml:"host,omitempty"`
LogstashFormat bool `json:"logstashFormat,omitempty" yaml:"logstashFormat,omitempty"`
Index string `json:",omitempty" yaml:",omitempty"`
LogstashPrefix string `json:"logstashPrefix,omitempty" yaml:"logstashPrefix,omitempty"`
Match string `json:",omitempty" yaml:",omitempty"`
Version string `json:",omitempty" yaml:",omitempty"`
Host string `json:"host" yaml:"host"`
LogstashFormat bool `json:"logstashFormat" yaml:"logstashFormat"`
Index string `json:"index" yaml:"index"`
LogstashPrefix string `json:"logstashPrefix,omitempty" yaml:"logstashPrefix"`
Match string `json:"match" yaml:"match"`
Version string `json:"version" yaml:"version"`
}
func NewElasticSearchOptions() *ElasticSearchOptions {
@@ -26,11 +26,6 @@ func NewElasticSearchOptions() *ElasticSearchOptions {
}
func (s *ElasticSearchOptions) ApplyTo(options *ElasticSearchOptions) {
if options == nil {
options = s
return
}
if s.Host != "" {
reflectutils.Override(options, s)
}