summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/diagnostics.go14
-rw-r--r--config/default.json8
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,