mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-16 21:14:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod/notification-email: $FlushEmailQueue: move the check up...

Browse source 
... as this needs to be done before creating a scheduler. 😜

Also remove the scheduler and return.
This commit is contained in:
Christian Hesse 2024-12-11 11:51:17 +01:00
parent 1e2ca3d214
commit 8c8c75ca66
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/notification-email.rsc
View file

@ -47,6 +47,12 @@
:local QueueLen [ :len $EmailQueue ]; :local QueueLen [ :len $EmailQueue ];
:local Scheduler [ /system/scheduler/find where name="_FlushEmailQueue" ]; :local Scheduler [ /system/scheduler/find where name="_FlushEmailQueue" ];
: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 ([ :len $Scheduler ] < 0) do={ :if ([ :len $Scheduler ] < 0) do={
/system/scheduler/add name="_FlushEmailQueue" interval=1m start-time=startup \ /system/scheduler/add name="_FlushEmailQueue" interval=1m start-time=startup \
comment="Doing initial checks..." on-event=(":global FlushEmailQueue; \$FlushEmailQueue;"); comment="Doing initial checks..." on-event=(":global FlushEmailQueue; \$FlushEmailQueue;");
@ -74,10 +80,6 @@
:return false; :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=($QueueLen . "m") comment="Sending..." $Scheduler; /system/scheduler/set interval=($QueueLen . "m") comment="Sending..." $Scheduler;
:foreach Id,Message in=$EmailQueue do={ :foreach Id,Message in=$EmailQueue do={