From ceaa83b83edb069ecf1cca181ec461519f0cc020 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 26 Feb 2020 14:19:54 +0100
Subject: global-functions: merge $LogAnd{Error,Put} to $LogPrintExit ...

... 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.
---
 check-routeros-update | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'check-routeros-update')

diff --git a/check-routeros-update b/check-routeros-update
index ff5bc38..d622ba3 100644
--- a/check-routeros-update
+++ b/check-routeros-update
@@ -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={
-- 
cgit v1.2.3-54-g00ecf