From f2d26801b9647715fb43af873354d8def753868b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Mon, 12 Mar 2018 17:52:17 +0000
Subject: Adding new global relay settings to diagnostics and default.json
 (#8441)

---
 app/diagnostics.go  | 14 +++++++++-----
 config/default.json |  8 +++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 12553afc8..4cff5f02a 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -502,11 +502,15 @@ func (a *App) trackConfig() {
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_MESSAGE_EXPORT, map[string]interface{}{
-		"enable_message_export":         *cfg.MessageExportSettings.EnableExport,
-		"export_format":                 *cfg.MessageExportSettings.ExportFormat,
-		"daily_run_time":                *cfg.MessageExportSettings.DailyRunTime,
-		"default_export_from_timestamp": *cfg.MessageExportSettings.ExportFromTimestamp,
-		"batch_size":                    *cfg.MessageExportSettings.BatchSize,
+		"enable_message_export":                 *cfg.MessageExportSettings.EnableExport,
+		"export_format":                         *cfg.MessageExportSettings.ExportFormat,
+		"daily_run_time":                        *cfg.MessageExportSettings.DailyRunTime,
+		"default_export_from_timestamp":         *cfg.MessageExportSettings.ExportFromTimestamp,
+		"batch_size":                            *cfg.MessageExportSettings.BatchSize,
+		"global_relay_customer_type":            *cfg.MessageExportSettings.GlobalRelaySettings.CustomerType,
+		"is_default_global_relay_smtp_username": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.SmtpUsername, ""),
+		"is_default_global_relay_smtp_password": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.SmtpPassword, ""),
+		"is_default_global_relay_email_address": isDefault(*cfg.MessageExportSettings.GlobalRelaySettings.EmailAddress, ""),
 	})
 }
 
diff --git a/config/default.json b/config/default.json
index cd170adef..b6bcc270a 100644
--- a/config/default.json
+++ b/config/default.json
@@ -358,7 +358,13 @@
         "DailyRunTime": "01:00",
         "ExportFromTimestamp": 0,
         "FileLocation": "export",
-        "BatchSize": 10000
+        "BatchSize": 10000,
+        "GlobalRelaySettings": {
+            "CustomerType": "A9",
+            "SmtpUsername": "",
+            "SmtpPassword": "",
+            "EmailAddress": ""
+        }
     },
     "JobSettings": {
         "RunJobs": true,
-- 
cgit v1.2.3-1-g7c22