Move thread lock up + long running backup check

Author: ThomasTJdev

nimletter.nim

@@ -110,7 +110,7 @@ proc scheduleStart() {.thread.} =
 
       every(minutes=30, id="tick", throttle=2):
         echo "Backup schedule check: " & $now() & " on thread " & $getThreadId()
-        checkAndSendScheduledEmails(minutesBack = 60, until = now() - initDuration(minutes = 10))
+        checkAndSendScheduledEmails(minutesBack = 60, until = now() - initDuration(minutes = 10), isBackupRun = true)
 
 
 

nimletter.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.4.6"
+version       = "0.4.7"
 author        = "ThomasTJdev"
 description   = "Newsletter"
 license       = "AGPL v3"

src/scheduling/check_schedule.nim

@@ -22,7 +22,7 @@ initLock(gPendingEmailLock)
 
 
 
-proc checkAndSendScheduledEmails*(minutesBack = 5, until = now().utc) =
+proc checkAndSendScheduledEmails*(minutesBack = 5, until = now().utc, isBackupRun = false) =
 
   acquire(gPendingEmailLock)
 
@@ -54,7 +54,7 @@ proc checkAndSendScheduledEmails*(minutesBack = 5, until = now().utc) =
         where = [
           "pending_emails.scheduled_for <= ?",
           "pending_emails.scheduled_for >= ?",
-          "pending_emails.status = 'pending'"
+          "pending_emails.status = 'pending'" & (if isBackupRun: " OR pending_emails.status = 'inprogress'" else: "")
         ]
       ),
       rightNow,
@@ -73,6 +73,8 @@ proc checkAndSendScheduledEmails*(minutesBack = 5, until = now().utc) =
       ]
     ), "inprogress", rightNow, timeThreshold)
 
+  release(gPendingEmailLock)
+
   for pendingEmail in pendingEmails:
     echo "Sending email: " & pendingEmail[0]
 
@@ -94,4 +96,3 @@ proc checkAndSendScheduledEmails*(minutesBack = 5, until = now().utc) =
       manualSubject: pendingEmail[14]
     )
 
-  release(gPendingEmailLock)