Compare commits

...

2 commits

Author SHA1 Message Date
Christian Hesse
8dcdc4b086 global-functions: drop $HexToNum 2026-01-13 22:56:50 +01:00
Christian Hesse
577c226deb log-forward: try to mitigate a race condition 2026-01-13 22:56:50 +01:00
2 changed files with 5 additions and 17 deletions

View file

@ -47,7 +47,6 @@
:global GetRandom20CharHex;
:global GetRandomNumber;
:global Grep;
:global HexToNum;
:global HumanReadableNum;
:global IfThenElse;
:global IsDefaultRouteReachable;
@ -717,19 +716,6 @@
:return [];
}
# convert from hex (string) to num
:set HexToNum do={
:local Input [ :tostr $1 ];
:global HexToNum;
:if ([ :pick $Input 0 ] = "*") do={
:return [ $HexToNum [ :pick $Input 1 [ :len $Input ] ] ];
}
:return [ :tonum ("0x" . $Input) ];
}
# return human readable number
:set HumanReadableNum do={
:local Input [ :tonum $1 ];

View file

@ -63,8 +63,11 @@
:set LogForwardInclude [ $EitherOr $LogForwardInclude [] ];
:set LogForwardIncludeMessage [ $EitherOr $LogForwardIncludeMessage [] ];
:local LogAll [ /log/find ];
:local LogForwardMax ($LogAll->([ :len $LogAll ] - 1) );
: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 \
!(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
topics~$LogForwardInclude or message~$LogForwardIncludeMessage) ] do={
@ -105,8 +108,7 @@
:set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
}
:local LogAll [ /log/find ];
:set LogForwardLast ($LogAll->([ :len $LogAll ] - 1) );
:set LogForwardLast $LogForwardMax;
} do={
:global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
}