diff options
| author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
| commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
| tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /app/diagnostics.go | |
| parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
| parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
| download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 46473dc7a..c74224f19 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -241,6 +241,9 @@ func (a *App) trackConfig() { "enable_tutorial": *cfg.ServiceSettings.EnableTutorial, "experimental_enable_default_channel_leave_join_messages": *cfg.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages, "experimental_group_unread_channels": *cfg.ServiceSettings.ExperimentalGroupUnreadChannels, + "isdefault_image_proxy_type": isDefault(*cfg.ServiceSettings.ImageProxyType, ""), + "isdefault_image_proxy_url": isDefault(*cfg.ServiceSettings.ImageProxyURL, ""), + "isdefault_image_proxy_options": isDefault(*cfg.ServiceSettings.ImageProxyOptions, ""), }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ @@ -347,7 +350,8 @@ func (a *App) trackConfig() { a.SendDiagnostic(TRACK_CONFIG_RATE, map[string]interface{}{ "enable_rate_limiter": *cfg.RateLimitSettings.Enable, - "vary_by_remote_address": cfg.RateLimitSettings.VaryByRemoteAddr, + "vary_by_remote_address": *cfg.RateLimitSettings.VaryByRemoteAddr, + "vary_by_user": *cfg.RateLimitSettings.VaryByUser, "per_sec": *cfg.RateLimitSettings.PerSec, "max_burst": *cfg.RateLimitSettings.MaxBurst, "memory_store_size": *cfg.RateLimitSettings.MemoryStoreSize, |