diff options
author | Christian Hesse <mail@eworm.de> | 2024-12-09 09:13:18 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2024-12-09 11:49:50 +0100 |
commit | 519cb85e28e52c476ecb210e1ed201f64190f898 (patch) | |
tree | 0f64567c8631c4569c1ea62409f1f991b3039bc6 /mod/notification-email.rsc | |
parent | e51191035b21c529efb4387dfe59976c3112f561 (diff) | |
parent | 210ef26b93364f4b69cde9ff34139d51572357ee (diff) |
Merge branch 'func-exit-error' into next
Diffstat (limited to 'mod/notification-email.rsc')
-rw-r--r-- | mod/notification-email.rsc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc index 3d62ddf..e51779b 100644 --- a/mod/notification-email.rsc +++ b/mod/notification-email.rsc @@ -34,7 +34,7 @@ } # flush e-mail queue -:set FlushEmailQueue do={ +:set FlushEmailQueue do={ :do { :global EmailQueue; :global EitherOr; @@ -113,7 +113,9 @@ } else={ /system/scheduler/set interval=1m comment="Waiting for retry..." $Scheduler; } -} +} on-error={ + :global ExitError; $ExitError false $0; +} } # generate filter for log-forward :set LogForwardFilterLogForwarding do={ @@ -224,11 +226,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={ |