makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app.go: Use cfg.Email.Enabled() to check for email config

Browse source 
before starting publishJobsQueue.

 Also fix Email.Enabled to handle smtp config.
This commit is contained in:
Jean-Baptiste Giraudeau 2024-12-04 11:13:04 +01:00
parent 0be229cdaa
commit e65b73dc73
No known key found for this signature in database
GPG key ID: 7CEF8C9CC2D9933B
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app.go
View file

@ -428,15 +428,11 @@ func Initialize(apper Apper, debug bool) (*App, error) {
initActivityPub(apper.App()) initActivityPub(apper.App())
if apper.App().cfg.Email.Domain != "" || apper.App().cfg.Email.MailgunPrivate != "" { if apper.App().cfg.Email.Enabled() {
if apper.App().cfg.Email.Domain == "" {
log.Error("[FAILED] Starting publish jobs queue: no [letters]domain config value set.")
} else if apper.App().cfg.Email.MailgunPrivate == "" {
log.Error("[FAILED] Starting publish jobs queue: no [letters]mailgun_private config value set.")
} else {
log.Info("Starting publish jobs queue...") log.Info("Starting publish jobs queue...")
go startPublishJobsQueue(apper.App()) go startPublishJobsQueue(apper.App())
} } else {
log.Error("[FAILED] Starting publish jobs queue: no email provider is configured.")
} }
// Handle local timeline, if enabled // Handle local timeline, if enabled

3
config/config.go
View file

@ -251,7 +251,8 @@ func (ac *AppCfg) LandingPath() string {
} }
func (lc EmailCfg) Enabled() bool { func (lc EmailCfg) Enabled() bool {
return lc.Domain != "" && lc.MailgunPrivate != "" return (lc.Domain != "" && lc.MailgunPrivate != "") ||
lc.Username != "" && lc.Password != "" && lc.Host != "" && lc.Port > 0
} }
func (ac AppCfg) SignupPath() string { func (ac AppCfg) SignupPath() string {