From 73530baf994a33ae7d6953a293f91a16572c1607 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 13 Jan 2026 21:33:26 +0100 Subject: [PATCH 1/3] global-functions: drop $HexToNum --- global-functions.rsc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/global-functions.rsc b/global-functions.rsc index 94fc72ba..d4fe0aff 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -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 ]; From 577c226deb71f7a94f5b2a6ed863fa7d8fb34d1a Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 13 Jan 2026 22:46:54 +0100 Subject: [PATCH 2/3] log-forward: try to mitigate a race condition --- log-forward.rsc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/log-forward.rsc b/log-forward.rsc index a3a4bc9f..fdbe1173 100644 --- a/log-forward.rsc +++ b/log-forward.rsc @@ -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; } From 8dcdc4b086e4c9f0ac035b30cf85c7acf3940d8a Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 13 Jan 2026 21:33:26 +0100 Subject: [PATCH 3/3] global-functions: drop $HexToNum --- global-functions.rsc | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/global-functions.rsc b/global-functions.rsc index 94fc72ba..d4fe0aff 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -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 ];