mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-08-31 23:20:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: merge $LogAnd{Error,Put} to $LogPrintExit ...

Browse source 
... and fix logging.

Logging with severity from variable (:log $severity ...) is not
possible, this is considered a syntax error. Also the 'workaround' with
parsing code failed with missing message in log.

The reliable code is a lot longer, so merge the two functions to save a
lot of duplicate code.
This commit is contained in:
Christian Hesse 2020-02-26 14:19:54 +01:00
parent 6036edb506
commit ceaa83b83e
13 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
script-updates
View file

@ -15,7 +15,7 @@
:global ScriptUpdatesIgnore;
:global SendNotification;
:global LogAndPut;
:global LogPrintExit;
:foreach Script in=[ / system script find where source~"^#!rsc" ] do={
:local Ignore 0;
@ -30,15 +30,15 @@
:foreach Scheduler in=[ / system scheduler find where on-event~("\\b" . $ScriptVal->"name" . "\\b") ] do={
:local SchedulerVal [ / system scheduler get $Scheduler ];
:if ($ScriptVal->"policy" != $SchedulerVal->"policy") do={
$LogAndPut warning ("Policies differ for script " . $ScriptVal->"name" . \
" and its scheduler " . $SchedulerVal->"name" . "!");
$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 && \
[ :pick ($SchedulerVal->"on-event") 0 7 ] != ":delay ") do={
$LogAndPut warning ("Scheduler " . $SchedulerVal->"name" . " starts on startup, " . \
"without interval. Add delay to make sure the configuration is available!");
$LogPrintExit warning ("Scheduler " . $SchedulerVal->"name" . " starts on startup, " . \
"without interval. Add delay to make sure the configuration is available!") false;
}
}
@ -57,7 +57,7 @@
:set SourceNew ($Result->"data");
}
} on-error={
$LogAndPut warning ("Failed fetching " . $ScriptVal->"name");
$LogPrintExit warning ("Failed fetching " . $ScriptVal->"name") false;
}
}
}
@ -67,7 +67,7 @@
:if ($SourceNew != $ScriptVal->"source") do={
:local DontRequirePermissions \
($SourceNew~"\n# requires: dont-require-permissions=yes\n");
$LogAndPut info ("Updating script: " . $ScriptVal->"name");
$LogPrintExit info ("Updating script: " . $ScriptVal->"name") false;
/ system script set owner=($ScriptVal->"name") source=$SourceNew \
dont-require-permissions=$DontRequirePermissions $Script;
:if ($ScriptVal->"name" = "global-config" && \
@ -81,7 +81,7 @@
:log debug ("Script " . $ScriptVal->"name" . " did not change.");
}
} else={
$LogAndPut warning ("Looks like new script " . $ScriptVal->"name" . " is not valid. Ignoring!");
$LogPrintExit warning ("Looks like new script " . $ScriptVal->"name" . " is not valid. Ignoring!") false;
}
} else={
:log debug ("No update for script " . $ScriptVal->"name" . ".");
@ -117,7 +117,7 @@
}
:set GlobalConfigChanges;
} on-error={
$LogAndPut warning ("Failed fetching changes!");
$LogPrintExit warning ("Failed fetching changes!") false;
:set NotificationMessage ($NotificationMessage . \
"\n\nChanges are not available.");
}