diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-10-16 18:17:12 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-16 18:17:12 -0400 |
| commit | a649602fc373615665ae2eaec95a4e9063eb699d (patch) | |
| tree | c0934b9b6483a49f4860069fae70fa9f84b5093a | |
| parent | ce314425d1e1ab5703c41510a0dba569fb6ffad3 (diff) | |
| download | chat-a649602fc373615665ae2eaec95a4e9063eb699d.tar.gz chat-a649602fc373615665ae2eaec95a4e9063eb699d.tar.bz2 chat-a649602fc373615665ae2eaec95a4e9063eb699d.zip | |
Add two missing diagnostics entries (#7634)
* Update diagnostics.go
* Fix config setting name SessionIdleTimeoutInMinutes
* Update diagnostics.go
| -rw-r--r-- | app/diagnostics.go | 2 | ||||
| -rw-r--r-- | config/default.json | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 9e5742111..5f5ef35b2 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -204,6 +204,7 @@ func trackConfig() { "session_length_mobile_in_days": *utils.Cfg.ServiceSettings.SessionLengthMobileInDays, "session_length_sso_in_days": *utils.Cfg.ServiceSettings.SessionLengthSSOInDays, "session_cache_in_minutes": *utils.Cfg.ServiceSettings.SessionCacheInMinutes, + "session_idle_timeout_in_minutes": *utils.Cfg.ServiceSettings.SessionIdleTimeoutInMinutes, "isdefault_site_url": isDefault(*utils.Cfg.ServiceSettings.SiteURL, model.SERVICE_SETTINGS_DEFAULT_SITE_URL), "isdefault_tls_cert_file": isDefault(*utils.Cfg.ServiceSettings.TLSCertFile, model.SERVICE_SETTINGS_DEFAULT_TLS_CERT_FILE), "isdefault_tls_key_file": isDefault(*utils.Cfg.ServiceSettings.TLSKeyFile, model.SERVICE_SETTINGS_DEFAULT_TLS_KEY_FILE), @@ -442,6 +443,7 @@ func trackConfig() { "sniff": *utils.Cfg.ElasticsearchSettings.Sniff, "post_index_replicas": *utils.Cfg.ElasticsearchSettings.PostIndexReplicas, "post_index_shards": *utils.Cfg.ElasticsearchSettings.PostIndexShards, + "isdefault_index_prefix": isDefault(*utils.Cfg.ElasticsearchSettings.IndexPrefix, model.ELASTICSEARCH_SETTINGS_DEFAULT_INDEX_PREFIX), }) SendDiagnostic(TRACK_CONFIG_PLUGIN, map[string]interface{}{ diff --git a/config/default.json b/config/default.json index f9c5647e7..fd3e81baa 100644 --- a/config/default.json +++ b/config/default.json @@ -36,7 +36,7 @@ "SessionLengthMobileInDays": 30, "SessionLengthSSOInDays": 30, "SessionCacheInMinutes": 10, - "SessionIdleTimeout": 0, + "SessionIdleTimeoutInMinutes": 0, "WebsocketSecurePort": 443, "WebsocketPort": 80, "WebserverMode": "gzip", |