diff options
Diffstat (limited to 'app/email_batching.go')
| -rw-r--r-- | app/email_batching.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/email_batching.go b/app/email_batching.go index 5e4a36daf..e69870814 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -140,13 +140,14 @@ func (job *EmailBatchingJob) checkPendingNotifications(now time.Time, handler fu // get how long we need to wait to send notifications to the user var interval int64 if result := <-pchan; result.Err != nil { - // default to 30 seconds to match the send "immediate" setting - interval, _ = strconv.ParseInt(model.PREFERENCE_DEFAULT_EMAIL_INTERVAL, 10, 64) + // use the default batching interval if an error ocurrs while fetching user preferences + interval, _ = strconv.ParseInt(model.PREFERENCE_EMAIL_INTERVAL_BATCHING_SECONDS, 10, 64) } else { preference := result.Data.(model.Preference) if value, err := strconv.ParseInt(preference.Value, 10, 64); err != nil { - interval, _ = strconv.ParseInt(model.PREFERENCE_DEFAULT_EMAIL_INTERVAL, 10, 64) + // // use the default batching interval if an error ocurrs while deserializing user preferences + interval, _ = strconv.ParseInt(model.PREFERENCE_EMAIL_INTERVAL_BATCHING_SECONDS, 10, 64) } else { interval = value } |