1 files changed, 42 insertions, 16 deletions

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 3d62ddf..7b89d98 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -1,12 +1,13 @@
 #!rsc by RouterOS
 # RouterOS script: mod/notification-email
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.15
+# requires device-mode, email, scheduler
 #
 # send notifications via e-mail
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-email.md
+# https://rsc.eworm.de/doc/mod/notification-email.md
 
 :global EMailGenerateFrom;
 :global FlushEmailQueue;
@@ -34,7 +35,7 @@
 }
 
 # flush e-mail queue
-:set FlushEmailQueue do={
+:set FlushEmailQueue do={ :do {
   :global EmailQueue;
 
   :global EitherOr;
@@ -47,7 +48,24 @@
   :local QueueLen [ :len $EmailQueue ];
   :local Scheduler [ /system/scheduler/find where name="_FlushEmailQueue" ];
 
-  :if ([ :len $Scheduler ] > 0 && [ /system/scheduler/get $Scheduler interval ] < 1m) do={
+  :if ([ :len $Scheduler ] > 0 && $QueueLen = 0) do={
+    $LogPrint warning $0 ("Flushing E-Mail messages from scheduler, but queue is empty.");
+    /system/scheduler/remove $Scheduler;
+    :return false;
+  }
+
+  :if ($QueueLen = 0) do={
+    :return true;
+  }
+
+  :if ([ :len $Scheduler ] < 0) do={
+    /system/scheduler/add name="_FlushEmailQueue" interval=1m start-time=startup \
+        comment="Doing initial checks..." on-event=(":global FlushEmailQueue; \$FlushEmailQueue;");
+    :set Scheduler [ /system/scheduler/find where name="_FlushEmailQueue" ];
+  }
+
+  :local SchedVal [ /system/scheduler/get $Scheduler ];
+  :if (($SchedVal->"interval") < 1m) do={
     /system/scheduler/set interval=1m comment="Doing initial checks..." $Scheduler;
   }
 
@@ -67,11 +85,7 @@
     :return false;
   }
 
-  :if ([ :len $Scheduler ] > 0 && $QueueLen = 0) do={
-    $LogPrint warning $0 ("Flushing E-Mail messages from scheduler, but queue is empty.");
-  }
-
-  /system/scheduler/set interval=([ $EitherOr $QueueLen 1 ] . "m") comment="Sending..." $Scheduler;
+  /system/scheduler/set interval=($QueueLen . "m") comment="Sending..." $Scheduler;
 
   :foreach Id,Message in=$EmailQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
@@ -110,10 +124,20 @@
   :if ($AllDone = true && $QueueLen = [ :len $EmailQueue ]) do={
     /system/scheduler/remove $Scheduler;
     :set EmailQueue;
-  } else={
-    /system/scheduler/set interval=1m comment="Waiting for retry..." $Scheduler;
+    :return true;
   }
-}
+
+  :if ([ :len [ /system/scheduler/find where name="_FlushEmailQueue" ] ] = 0 && \
+       [ :typeof $EmailQueue ] = "nothing") do={
+    $LogPrint info $0 ("Queue was purged? Exiting.");
+    :return false;
+  }
+
+  /system/scheduler/set interval=(($SchedVal->"run-count") . "m") \
+      comment="Waiting for retry..." $Scheduler;
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # generate filter for log-forward
 :set LogForwardFilterLogForwarding do={
@@ -224,11 +248,13 @@
 }
 
 # send notification via e-mail - expects at least two string arguments
-:set SendEMail do={
+:set SendEMail do={ :do {
   :global SendEMail2;
 
   $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 });
-}
+} on-error={
+  :global ExitError; $ExitError false $0;
+} }
 
 # send notification via e-mail - expects one array argument
 :set SendEMail2 do={