From d5afc79eed2a54ab005f1b0ccf656c43a57e0a9b Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 18 Feb 2021 14:52:47 +0100 Subject: global: drop script 'global-wait' All scripts wait for the global functions on their own now. --- global-functions | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'global-functions') diff --git a/global-functions b/global-functions index bf09ad2..072164d 100644 --- a/global-functions +++ b/global-functions @@ -8,7 +8,7 @@ # https://git.eworm.de/cgit/routeros-scripts/about/ # expected configuration version -:global ExpectedConfigVersion 43; +:global ExpectedConfigVersion 44; # global variables not to be changed by user :global GlobalFunctionsReady false; @@ -624,13 +624,6 @@ $LogPrintExit warning ("Policies differ for script " . $ScriptVal->"name" . \ " and its scheduler " . $SchedulerVal->"name" . "!") false; } - :if ($SchedulerVal->"name" != "global-scripts" && \ - $SchedulerVal->"start-time" = "startup" && \ - $SchedulerVal->"interval" = 0s && \ - !(($SchedulerVal->"on-event") ~ "\\brun global-wait\\b")) do={ - $LogPrintExit warning ("Scheduler " . $SchedulerVal->"name" . " starts on startup, " . \ - "without waiting for global-functions. Run 'global-wait' to avoid race conditions!") false; - } } :if ([ :len $SourceNew ] = 0 && $ScriptUpdatesFetch = true) do={ -- cgit v1.2.3-54-g00ecf