global-functions: $ExitError: drop argument $ExitOK...

... as the is no longer required with early exit with :exit.
This commit is contained in:
Christian Hesse 2026-01-19 15:29:59 +01:00
parent eb182fe769
commit 2e422a153f
69 changed files with 83 additions and 86 deletions

View file

@ -32,5 +32,5 @@
:set ($Seen->$Mac) 1; :set ($Seen->$Mac) 1;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -32,5 +32,5 @@
:set ($Seen->$Mac) 1; :set ($Seen->$Mac) 1;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -41,5 +41,5 @@
:set ($Seen->$Mac) 1; :set ($Seen->$Mac) 1;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -32,5 +32,5 @@
:set ($Seen->$Mac) 1; :set ($Seen->$Mac) 1;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -96,5 +96,5 @@
} }
$RmDir "tmpfs/backup-cloud"; $RmDir "tmpfs/backup-cloud";
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -133,5 +133,5 @@
} }
# do not remove the files here, as the mail is still queued! # do not remove the files here, as the mail is still queued!
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -115,5 +115,5 @@
:exit; :exit;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -169,5 +169,5 @@
} }
$RmDir $DirName; $RmDir $DirName;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -85,5 +85,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -96,5 +96,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -87,5 +87,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -44,5 +44,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -52,5 +52,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -45,5 +45,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -46,5 +46,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -248,5 +248,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -103,5 +103,5 @@
:set CheckHealthPlugins; :set CheckHealthPlugins;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -101,5 +101,5 @@
$CheckInterface $ScriptName $Interface; $CheckInterface $ScriptName $Interface;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -69,5 +69,5 @@
:set SentCertificateNotification; :set SentCertificateNotification;
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -203,5 +203,5 @@
:set SentRouterosUpdateNotification ($Update->"latest-version"); :set SentRouterosUpdateNotification ($Update->"latest-version");
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -94,5 +94,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -95,5 +95,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -112,5 +112,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -94,5 +94,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -90,5 +90,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -89,5 +89,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -105,5 +105,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -90,5 +90,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -37,5 +37,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -37,5 +37,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -42,5 +42,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -37,5 +37,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -124,5 +124,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -52,5 +52,5 @@
$LogPrint info $ScriptName ("Firmware upgrade successful, rebooting."); $LogPrint info $ScriptName ("Firmware upgrade successful, rebooting.");
/system/reboot; /system/reboot;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -230,5 +230,5 @@
" - removed: " . [ $HumanReadableNum $CntRemove 1000 ]); " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]);
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -474,18 +474,15 @@
# simple macro to print error message on unintentional error # simple macro to print error message on unintentional error
:set ExitError do={ :set ExitError do={
:local ExitOK [ :tostr $1 ]; :local Name [ :tostr $1 ];
:local Name [ :tostr $2 ]; :local Error [ :tostr $2 ];
:local Error [ :tostr $3 ];
:global IfThenElse; :global IfThenElse;
:global LogPrint; :global LogPrint;
:if ($ExitOK = "false") do={ $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
$LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \ "Function" "Script" ] . " '" . $Name . "' exited with error" . \
"Function" "Script" ] . " '" . $Name . "' exited with error" . \ [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]);
[ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]);
}
} }
# fetch huge data to file, read in chunks # fetch huge data to file, read in chunks
@ -1503,7 +1500,7 @@
:set GlobalConfigMigration; :set GlobalConfigMigration;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# lock script against multiple invocation # lock script against multiple invocation
@ -1649,7 +1646,7 @@
$SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); $SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via NotificationFunctions - expects one array argument # send notification via NotificationFunctions - expects one array argument

View file

@ -47,5 +47,5 @@
$LogPrint debug $ScriptName ("GPS data not valid."); $LogPrint debug $ScriptName ("GPS data not valid.");
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -74,5 +74,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -81,5 +81,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -74,5 +74,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -97,5 +97,5 @@
:delay 2s; :delay 2s;
/caps-man/access-list/set $Entry action=accept; /caps-man/access-list/set $Entry action=accept;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -117,5 +117,5 @@
/caps-man/access-list/set $Entry action=accept; /caps-man/access-list/set $Entry action=accept;
/interface/wifi/access-list/set $Entry action=accept; /interface/wifi/access-list/set $Entry action=accept;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -94,5 +94,5 @@
:delay 2s; :delay 2s;
/interface/wifi/access-list/set $Entry action=accept; /interface/wifi/access-list/set $Entry action=accept;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -78,5 +78,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -98,5 +98,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -57,5 +57,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -108,5 +108,5 @@
:set LogForwardLast $Max; :set LogForwardLast $Max;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -66,5 +66,5 @@
/interface/ethernet/enable $InterfaceReEnable; /interface/ethernet/enable $InterfaceReEnable;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }

View file

@ -75,5 +75,5 @@
/interface/ethernet/enable $InterfaceReEnable; /interface/ethernet/enable $InterfaceReEnable;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }

View file

@ -17,7 +17,7 @@
:put [ :tocrlf [ $InspectVarReturn $1 ] ]; :put [ :tocrlf [ $InspectVarReturn $1 ] ];
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# inspect variable and return formatted string # inspect variable and return formatted string

View file

@ -28,7 +28,7 @@
[ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \ [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \
[ $FormatLine "Broadcast" ($Values->"broadcast") ]) ]; [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ];
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# calculate and return netmask, network, min host, max host and broadcast # calculate and return netmask, network, min host, max host and broadcast

View file

@ -131,7 +131,7 @@
/system/scheduler/set interval=(($SchedVal->"run-count") . "m") \ /system/scheduler/set interval=(($SchedVal->"run-count") . "m") \
comment="Waiting for retry..." $Scheduler; comment="Waiting for retry..." $Scheduler;
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# generate filter for log-forward # generate filter for log-forward
@ -259,7 +259,7 @@
$SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 }); $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via e-mail - expects one array argument # send notification via e-mail - expects one array argument

View file

@ -54,7 +54,7 @@
:set GotifyQueue; :set GotifyQueue;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via Gotify - expects one array argument # send notification via Gotify - expects one array argument
@ -126,7 +126,7 @@
$SendGotify2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); $SendGotify2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via Gotify - expects one array argument # send notification via Gotify - expects one array argument

View file

@ -59,7 +59,7 @@
:set MatrixQueue; :set MatrixQueue;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via Matrix - expects one array argument # send notification via Matrix - expects one array argument
@ -172,7 +172,7 @@
$SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 }); $SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via Matrix - expects one array argument # send notification via Matrix - expects one array argument

View file

@ -53,7 +53,7 @@
:set NtfyQueue; :set NtfyQueue;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via ntfy - expects one array argument # send notification via ntfy - expects one array argument
@ -148,7 +148,7 @@
$SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via ntfy - expects one array argument # send notification via ntfy - expects one array argument

View file

@ -62,7 +62,7 @@
:set TelegramQueue; :set TelegramQueue;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# get the chat id # get the chat id
@ -101,7 +101,7 @@
$LogPrint info $0 ("The thread id is: " . ($Message->"message_thread_id")); $LogPrint info $0 ("The thread id is: " . ($Message->"message_thread_id"));
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via telegram - expects one array argument # send notification via telegram - expects one array argument
@ -237,7 +237,7 @@
$SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); $SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# send notification via telegram - expects one array argument # send notification via telegram - expects one array argument

View file

@ -52,5 +52,5 @@
:return true; :return true;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }

View file

@ -67,7 +67,7 @@
:return false; :return false;
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
# import keys from a file # import keys from a file
@ -109,5 +109,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }

View file

@ -82,7 +82,7 @@
$LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses."); $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
} }
} do={ } do={
:global ExitError; $ExitError false $0 $Err; :global ExitError; $ExitError $0 $Err;
} } } }
/system/scheduler/add name="_ModeButtonScheduler" \ /system/scheduler/add name="_ModeButtonScheduler" \
on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s; on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
@ -91,5 +91,5 @@
/system/scheduler/set $Scheduler start-time=[ /system/clock/get time ]; /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -139,5 +139,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -223,5 +223,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -43,5 +43,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -164,5 +164,5 @@
:delay 1s; :delay 1s;
/system/reboot; /system/reboot;
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -38,5 +38,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -35,5 +35,5 @@
$LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!"); $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!");
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -103,5 +103,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -192,5 +192,5 @@
:set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \ :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \
[ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]); [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]);
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -40,5 +40,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }

View file

@ -66,5 +66,5 @@
} }
} }
} do={ } do={
:global ExitError; $ExitError false [ :jobname ] $Err; :global ExitError; $ExitError [ :jobname ] $Err;
} }