hangar-tech
/
listmonk
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update list date on import before notif and run notif as a goroutine

This commit is contained in:
Kailash Nadh 2019-05-14 22:18:18 +05:30
parent 8701cb445a
commit 3a6f15e9dc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -200,7 +200,8 @@ func main() {
// Initialize the bulk subscriber importer. // Initialize the bulk subscriber importer.
importNotifCB := func(subject string, data map[string]interface{}) error { importNotifCB := func(subject string, data map[string]interface{}) error {
return sendNotification(notifTplImport, subject, data, app) go sendNotification(notifTplImport, subject, data, app)
return nil
} }
app.Importer = subimporter.New(q.UpsertSubscriber.Stmt, app.Importer = subimporter.New(q.UpsertSubscriber.Stmt,
q.UpsertBlacklistSubscriber.Stmt, q.UpsertBlacklistSubscriber.Stmt,

7
subimporter/importer.go
View File

@ -277,12 +277,10 @@ func (s *Session) Start() {
if cur == 0 { if cur == 0 {
s.im.setStatus(StatusFinished) s.im.setStatus(StatusFinished)
s.log.Printf("imported finished") s.log.Printf("imported finished")
s.im.sendNotif(StatusFinished)
if _, err := s.im.updateListDate.Exec(listIDs); err != nil { if _, err := s.im.updateListDate.Exec(listIDs); err != nil {
s.log.Printf("error updating lists date: %v", err) s.log.Printf("error updating lists date: %v", err)
} }
s.im.sendNotif(StatusFinished)
return return
} }
@ -298,11 +296,10 @@ func (s *Session) Start() {
s.im.incrementImportCount(cur) s.im.incrementImportCount(cur)
s.im.setStatus(StatusFinished) s.im.setStatus(StatusFinished)
s.log.Printf("imported finished") s.log.Printf("imported finished")
s.im.sendNotif(StatusFinished)
if _, err := s.im.updateListDate.Exec(listIDs); err != nil { if _, err := s.im.updateListDate.Exec(listIDs); err != nil {
s.log.Printf("error updating lists date: %v", err) s.log.Printf("error updating lists date: %v", err)
} }
s.im.sendNotif(StatusFinished)
} }
// Stop stops an active import session. // Stop stops an active import session.