log-forward: generate filter in mod/notification-email

This commit is contained in:
Christian Hesse 2023-01-11 09:21:13 +01:00
parent 34ed387343
commit 868557a24a
2 changed files with 20 additions and 8 deletions

View file

@ -19,11 +19,11 @@
:global LogForwardRateLimit;
:global NotificationsWithSymbols;
:global EscapeForRegEx;
:global EitherOr;
:global HexToNum;
:global IfThenElse;
:global LogForwardFilterLogForwarding;
:global LogPrintExit2;
:global QuotedPrintable;
:global ScriptLock;
:global SendNotification2;
:global SymbolByUnicodeName;
@ -48,12 +48,8 @@ $ScriptLock $0;
:local MessageVal;
:local MessageDups ({});
:local LogForwardFilterLogForwarding ("^Error sending e-mail <(" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "memo" ] . "Log Forwarding") ] ] . "|" . \
[ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
[ $SymbolForNotification "warning-sign" ] . "Log Forwarding") ] ] . ")>:");
:foreach Message in=[ /log/find where (!(message="") and !(message~$LogForwardFilterLogForwarding) and \
:foreach Message in=[ /log/find where (!(message="") and \
!(message~[ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ]) and \
!(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
topics~$LogForwardInclude or message~$LogForwardIncludeMessage ] do={
:set MessageVal [ /log/get $Message ];