mirror of
https://github.com/eworm-de/routeros-scripts.git
synced 2026-03-03 12:39:35 +00:00
log-forward: try to mitigate a race condition
This commit is contained in:
parent
c46e44e8a9
commit
577c226deb
1 changed files with 5 additions and 3 deletions
|
|
@ -63,8 +63,11 @@
|
||||||
:set LogForwardInclude [ $EitherOr $LogForwardInclude [] ];
|
:set LogForwardInclude [ $EitherOr $LogForwardInclude [] ];
|
||||||
:set LogForwardIncludeMessage [ $EitherOr $LogForwardIncludeMessage [] ];
|
:set LogForwardIncludeMessage [ $EitherOr $LogForwardIncludeMessage [] ];
|
||||||
|
|
||||||
|
:local LogAll [ /log/find ];
|
||||||
|
:local LogForwardMax ($LogAll->([ :len $LogAll ] - 1) );
|
||||||
:local LogForwardFilterLogForwardingCached [ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ];
|
:local LogForwardFilterLogForwardingCached [ $EitherOr [ $LogForwardFilterLogForwarding ] ("\$^") ];
|
||||||
:foreach Message in=[ /log/find where .id>$LogForwardLast and \
|
|
||||||
|
:foreach Message in=[ /log/find where .id>$LogForwardLast and .id<=$LogForwardMax and \
|
||||||
((!(message="") and !(message~$LogForwardFilterLogForwardingCached) and \
|
((!(message="") and !(message~$LogForwardFilterLogForwardingCached) and \
|
||||||
!(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
|
!(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
|
||||||
topics~$LogForwardInclude or message~$LogForwardIncludeMessage) ] do={
|
topics~$LogForwardInclude or message~$LogForwardIncludeMessage) ] do={
|
||||||
|
|
@ -105,8 +108,7 @@
|
||||||
:set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
|
:set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
|
||||||
}
|
}
|
||||||
|
|
||||||
:local LogAll [ /log/find ];
|
:set LogForwardLast $LogForwardMax;
|
||||||
:set LogForwardLast ($LogAll->([ :len $LogAll ] - 1) );
|
|
||||||
} do={
|
} do={
|
||||||
:global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
|
:global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue