mirror.MikroTik/nymurbd.MikroTik-scripts
1
0
Fork 0
mirror of https://github.com/nymurbd/MikroTik-scripts.git synced 2025-08-04 18:25:11 +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

6
check-routeros-update
View file

@ -11,7 +11,7 @@
:global DeviceInfo;
:global ScriptFromTerminal;
:global SendNotification;
:global LogAndError;
:global LogPrintExit;
:local DoUpdate do={
:if ([ / system script print count-only where name="packages-update" ] > 0) do={
@ -25,7 +25,7 @@
:if ([ / system package print count-only where name="wireless" disabled=no ] > 0) do={
:if ([ / interface wireless cap get enabled ] = true && \
[ / caps-man manager get enabled ] = false) do={
$LogAndError error "System is managed by CAPsMAN, not checking.";
$LogPrintExit error "System is managed by CAPsMAN, not checking." true;
}
}
@ -37,7 +37,7 @@
:local Update [ / system package update get ];
:if ([ :len ($Update->"latest-version") ] = 0) do={
$LogAndError warning "An empty string is not a valid version.";
$LogPrintExit warning "An empty string is not a valid version." true;
}
:if ($Update->"installed-version" != $Update->"latest-version") do={