aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-06 15:28:55 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit52f54baea08184294825b24a43f1c21a45de265d (patch)
tree429421d9cf093b73477e98979ecd0ac5e29728fb
parent6546e7f085c9a5ce33c6efa0b1887d178eb4ac5a (diff)
log-forward: drop main function, use :do with on-error
-rw-r--r--log-forward.rsc12
1 files changed, 5 insertions, 7 deletions
diff --git a/log-forward.rsc b/log-forward.rsc
index b9dbc8b..09e3b84 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -11,8 +11,8 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:local Main do={
- :local ScriptName [ :tostr $1 ];
+:do {
+ :local ScriptName [ :jobname ];
:global Identity;
:global LogForwardFilter;
@@ -33,7 +33,7 @@
:global SymbolForNotification;
:if ([ $ScriptLock $ScriptName ] = false) do={
- :return false;
+ :error false;
}
:if ([ :typeof $LogForwardRateLimit ] = "nothing") do={
@@ -43,7 +43,7 @@
:if ($LogForwardRateLimit > 30) do={
:set LogForwardRateLimit ($LogForwardRateLimit - 1);
$LogPrintExit2 info $ScriptName ("Rate limit in action, not forwarding logs, if any!") false;
- :return true;
+ :error false;
}
:local Count 0;
@@ -99,6 +99,4 @@
} else={
:set LogForwardRateLimit [ $MAX 0 ($LogForwardRateLimit - 1) ];
}
-}
-
-$Main [ :jobname ];
+} on-error={ }