Adding new global relay settings to diagnostics and default.json (#8441)

Этот коммит содержится в:
Jesús Espino
2018-03-12 17:52:17 +00:00
коммит произвёл GitHub
родитель 4e26594fcb
Коммит f2d26801b9
2 изменённых файлов: 16 добавлений и 6 удалений

Просмотреть файл

@@ -507,6 +507,10 @@ func (a *App) trackConfig() {
"daily_run_time": *cfg.MessageExportSettings.DailyRunTime, "daily_run_time": *cfg.MessageExportSettings.DailyRunTime,
"default_export_from_timestamp": *cfg.MessageExportSettings.ExportFromTimestamp, "default_export_from_timestamp": *cfg.MessageExportSettings.ExportFromTimestamp,
"batch_size": *cfg.MessageExportSettings.BatchSize, "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, ""),
}) })
} }

Просмотреть файл

@@ -358,7 +358,13 @@
"DailyRunTime": "01:00", "DailyRunTime": "01:00",
"ExportFromTimestamp": 0, "ExportFromTimestamp": 0,
"FileLocation": "export", "FileLocation": "export",
"BatchSize": 10000 "BatchSize": 10000,
"GlobalRelaySettings": {
"CustomerType": "A9",
"SmtpUsername": "",
"SmtpPassword": "",
"EmailAddress": ""
}
}, },
"JobSettings": { "JobSettings": {
"RunJobs": true, "RunJobs": true,