ChaoticByte/wid-notifier
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: don't save last published timestamp when email sending fails, so they can be sent in the next iteration

Browse source
This commit is contained in:
ChaoticByte 2025-06-11 22:05:44 +02:00
parent 2e1aee0313
commit ef24503214
No known key found for this signature in database
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
main.go
View file

@ -97,7 +97,8 @@ func main() {
for { for {
t1 := time.Now().UnixMilli() t1 := time.Now().UnixMilli()
newNotices := []WidNotice{} newNotices := []WidNotice{}
cache := map[string][]byte{} lastPublished := map[string]time.Time{} // endpoint id : last published timestamp
cache := map[string][]byte{} // cache generated emails for reuse
for _, a := range enabledApiEndpoints { for _, a := range enabledApiEndpoints {
logger.info("Querying endpoint '" + a.Id + "' for new notices ...") logger.info("Querying endpoint '" + a.Id + "' for new notices ...")
n, t, err := a.getNotices(persistent.data.(PersistentData).LastPublished[a.Id]) n, t, err := a.getNotices(persistent.data.(PersistentData).LastPublished[a.Id])
@ -113,14 +114,14 @@ func main() {
logger.error(err) logger.error(err)
} else if len(n) > 0 { } else if len(n) > 0 {
newNotices = append(newNotices, n...) newNotices = append(newNotices, n...)
persistent.data.(PersistentData).LastPublished[a.Id] = t lastPublished[a.Id] = t
persistent.save()
} }
} }
logger.debug(fmt.Sprintf("Got %v new notices", len(newNotices))) logger.debug(fmt.Sprintf("Got %v new notices", len(newNotices)))
if len(newNotices) > 0 { if len(newNotices) > 0 {
logger.info("Sending email notifications ...") logger.info("Sending email notifications ...")
recipientsNotified := 0 recipientsNotified := 0
var err error
for _, r := range config.Recipients { for _, r := range config.Recipients {
// Filter notices for this recipient // Filter notices for this recipient
filteredNotices := []WidNotice{} filteredNotices := []WidNotice{}
@ -134,14 +135,22 @@ func main() {
slices.Reverse(filteredNotices) slices.Reverse(filteredNotices)
logger.debug(fmt.Sprintf("Including %v of %v notices for recipient %v", len(filteredNotices), len(newNotices), r.Address)) logger.debug(fmt.Sprintf("Including %v of %v notices for recipient %v", len(filteredNotices), len(newNotices), r.Address))
// Send notices // Send notices
err := r.sendNotices(filteredNotices, mailTemplate, mailAuth, config.SmtpConfiguration, &cache) err = r.sendNotices(filteredNotices, mailTemplate, mailAuth, config.SmtpConfiguration, &cache)
if err != nil { if err != nil {
logger.error(err) logger.error(err)
} else { } else {
recipientsNotified++ recipientsNotified++
} }
} }
logger.info(fmt.Sprintf("Email notifications sent to %v of %v recipients", recipientsNotified, len(config.Recipients))) if recipientsNotified < 1 && err != nil {
logger.error("Couldn't send any mail notification!")
} else {
for id, t := range lastPublished {
persistent.data.(PersistentData).LastPublished[id] = t
persistent.save()
}
logger.info(fmt.Sprintf("Email notifications sent to %v of %v recipients", recipientsNotified, len(config.Recipients)))
}
} }
dt := int(time.Now().UnixMilli() - t1) dt := int(time.Now().UnixMilli() - t1)
time.Sleep(time.Millisecond * time.Duration((config.ApiFetchInterval * 1000) - dt)) time.Sleep(time.Millisecond * time.Duration((config.ApiFetchInterval * 1000) - dt))