IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change ES trace config type from boolean to string (#11019)

Browse Source
This commit is contained in:
Miguel de la Cruz
2019-05-31 17:25:11 +01:00
committed by GitHub
parent ec20d3a844
commit 74997a126e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.json
View File

@@ -397,7 +397,8 @@
"IndexPrefix": "",
"LiveIndexingBatchSize": 1,
"BulkIndexingTimeWindowSeconds": 3600,
"RequestTimeoutSeconds": 30
"RequestTimeoutSeconds": 30,
"Trace": ""
},
"DataRetentionSettings": {
"EnableMessageDeletion": false,

4
model/config.go
View File

@@ -1991,7 +1991,7 @@ type ElasticsearchSettings struct {
LiveIndexingBatchSize *int `restricted:"true"`
BulkIndexingTimeWindowSeconds *int `restricted:"true"`
RequestTimeoutSeconds *int `restricted:"true"`
Trace *bool `restricted:"true"`
Trace *string `restricted:"true"`
}
func (s *ElasticsearchSettings) SetDefaults() {
@@ -2072,7 +2072,7 @@ func (s *ElasticsearchSettings) SetDefaults() {
}
if s.Trace == nil {
s.Trace = NewBool(false)
s.Trace = NewString("")
}
}