diff options
| author | George Goldberg <george@gberg.me> | 2017-07-31 16:53:44 +0100 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-31 11:53:44 -0400 |
| commit | c506c5cac6627a42af778d744cdd36d6d7abaeb2 (patch) | |
| tree | 8f7a1fc2566f98c528822c16736d112abc71cec0 /model | |
| parent | 72f61ab96aabf65c162c8d94b5b843b5108ee1a9 (diff) | |
| download | chat-c506c5cac6627a42af778d744cdd36d6d7abaeb2.tar.gz chat-c506c5cac6627a42af778d744cdd36d6d7abaeb2.tar.bz2 chat-c506c5cac6627a42af778d744cdd36d6d7abaeb2.zip | |
PLT-6961: Add Elasticsearch settings to diagnostics. (#7021)
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/model/config.go b/model/config.go index 02af64477..1e091785f 100644 --- a/model/config.go +++ b/model/config.go @@ -118,6 +118,10 @@ const ( ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_COLOR = "#f2a93b" ANNOUNCEMENT_SETTINGS_DEFAULT_BANNER_TEXT_COLOR = "#333333" + + ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL = "" + ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME = "" + ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD = "" ) type ServiceSettings struct { @@ -1379,17 +1383,17 @@ func (o *Config) SetDefaults() { if o.ElasticsearchSettings.ConnectionUrl == nil { o.ElasticsearchSettings.ConnectionUrl = new(string) - *o.ElasticsearchSettings.ConnectionUrl = "" + *o.ElasticsearchSettings.ConnectionUrl = ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL } if o.ElasticsearchSettings.Username == nil { o.ElasticsearchSettings.Username = new(string) - *o.ElasticsearchSettings.Username = "" + *o.ElasticsearchSettings.Username = ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME } if o.ElasticsearchSettings.Password == nil { o.ElasticsearchSettings.Password = new(string) - *o.ElasticsearchSettings.Password = "" + *o.ElasticsearchSettings.Password = ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD } if o.ElasticsearchSettings.EnableIndexing == nil { |