From 7986eeea263703256fe81b93035472722b15e4ff Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Wed, 4 Apr 2018 08:14:23 -0400
Subject: Add missing timezone setting to app/diagnostics.go (#8572)

* Add missing timezone setting to app/diagnostics.go

* Update diagnostics.go

* Added TimezoneSettings.SupportedTimezonesPath to diagnostics
---
 app/diagnostics.go | 10 ++++++++++
 model/config.go    |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 1649bf6ee..6e9adbf3c 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -44,6 +44,8 @@ const (
 	TRACK_CONFIG_PLUGIN         = "config_plugin"
 	TRACK_CONFIG_DATA_RETENTION = "config_data_retention"
 	TRACK_CONFIG_MESSAGE_EXPORT = "config_message_export"
+	TRACK_CONFIG_DISPLAY        = "config_display"
+	TRACK_CONFIG_TIMEZONE       = "config_timezone"
 
 	TRACK_ACTIVITY = "activity"
 	TRACK_LICENSE  = "license"
@@ -514,6 +516,14 @@ func (a *App) trackConfig() {
 		"is_default_global_relay_smtp_password": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.SmtpPassword, ""),
 		"is_default_global_relay_email_address": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.EmailAddress, ""),
 	})
+
+	a.SendDiagnostic(TRACK_CONFIG_DISPLAY, map[string]interface{}{
+		"experimental_timezone": *cfg.DisplaySettings.ExperimentalTimezone,
+	})
+
+	a.SendDiagnostic(TRACK_CONFIG_TIMEZONE, map[string]interface{}{
+		"isdefault_supported_timezones_path": isDefault(*cfg.TimezoneSettings.SupportedTimezonesPath, model.TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH),
+	})
 }
 
 func (a *App) trackLicense() {
diff --git a/model/config.go b/model/config.go
index c2b514c33..6c6cf90e9 100644
--- a/model/config.go
+++ b/model/config.go
@@ -152,6 +152,8 @@ const (
 	PLUGIN_SETTINGS_DEFAULT_DIRECTORY        = "./plugins"
 	PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY = "./client/plugins"
 
+	TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH = "timezones.json"
+
 	COMPLIANCE_EXPORT_TYPE_ACTIANCE    = "actiance"
 	COMPLIANCE_EXPORT_TYPE_GLOBALRELAY = "globalrelay"
 	GLOBALRELAY_CUSTOMER_TYPE_A9       = "A9"
@@ -1728,7 +1730,7 @@ type TimezoneSettings struct {
 
 func (s *TimezoneSettings) SetDefaults() {
 	if s.SupportedTimezonesPath == nil {
-		s.SupportedTimezonesPath = NewString("timezones.json")
+		s.SupportedTimezonesPath = NewString(TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH)
 	}
 }
 
-- 
cgit v1.2.3-1-g7c22