PLT-1607 adding more debugging info for email and push notifications

Этот коммит содержится в:
=Corey Hulen
2016-01-05 20:35:36 -06:00
родитель 7f8cb30bd3
Коммит 01a5f67398
2 изменённых файлов: 31 добавлений и 4 удалений

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

@@ -54,7 +54,11 @@
"AmazonS3AccessKeyId": "",
"AmazonS3SecretAccessKey": "",
"AmazonS3Bucket": "",
"AmazonS3Region": ""
"AmazonS3Region": "",
"AmazonS3Endpoint": "",
"AmazonS3BucketEndpoint": "",
"AmazonS3LocationConstraint": false,
"AmazonS3LowercaseBucket": false
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
@@ -99,5 +103,28 @@
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
},
"GoogleSettings": {
"Enable": false,
"Secret": "",
"Id": "",
"Scope": "",
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
},
"LdapSettings": {
"Enable": false,
"LdapServer": null,
"LdapPort": 389,
"BaseDN": null,
"BindUsername": null,
"BindPassword": null,
"FirstNameAttribute": null,
"LastNameAttribute": null,
"EmailAttribute": null,
"UsernameAttribute": null,
"IdAttribute": null,
"QueryTimeout": 60
}
}
}

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

@@ -98,12 +98,12 @@ func SendMail(to, subject, body string) *model.AppError {
}
func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.AppError {
l4g.Debug("sending mail to " + to + " with subject of '" + subject + "'")
if !config.EmailSettings.SendEmailNotifications || len(config.EmailSettings.SMTPServer) == 0 {
return nil
}
l4g.Debug("sending mail to " + to + " with subject of '" + subject + "'")
fromMail := mail.Address{config.EmailSettings.FeedbackName, config.EmailSettings.FeedbackEmail}
toMail := mail.Address{"", to}