From f46db918453dcb8878b9a0de6e122fb0ea2224d9 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 22 Feb 2021 15:14:10 +0100
Subject: global: give script or function name in log messages

---
 update-tunnelbroker | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'update-tunnelbroker')

diff --git a/update-tunnelbroker b/update-tunnelbroker
index 6cdb195..2168390 100644
--- a/update-tunnelbroker
+++ b/update-tunnelbroker
@@ -7,15 +7,16 @@
 # update local address of tunnelbroker interface
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/update-tunnelbroker.md
 
+:local 0 "update-tunnelbroker";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :global CertificateAvailable;
-:global LogPrintExit;
+:global LogPrintExit2;
 :global ParseKeyValueStore;
 
 :if ([ / ip cloud get ddns-enabled ] != true) do={
-  $LogPrintExit error "IP cloud DDNS is not enabled." true;
+  $LogPrintExit2 error $0 ("IP cloud DDNS is not enabled.") true;
 }
 
 # Get the current ip address from cloud
@@ -32,14 +33,14 @@
     :local Comment [ $ParseKeyValueStore ($InterfaceVal->"comment") ];
 
     :if ([ $CertificateAvailable "Starfield Secure Certificate Authority - G2" ] = false) do={
-      $LogPrintExit error ("Downloading required certificate failed.") true;
+      $LogPrintExit2 error $0 ("Downloading required certificate failed.") true;
     }
-    $LogPrintExit info ("Local address changed, sending UPDATE to tunnelbroker! New address: " . $PublicAddress) false;
+    $LogPrintExit2 info $0 ("Local address changed, sending UPDATE to tunnelbroker! New address: " . $PublicAddress) false;
     / tool fetch check-certificate=yes-without-crl \
         ("https://ipv4.tunnelbroker.net/nic/update\?hostname=" . $Comment->"id") \
         user=($Comment->"user") password=($Comment->"pass") output=none;
     / interface 6to4 set $Interface local-address=$PublicAddress;
   } else={
-    $LogPrintExit debug ("All tunnelbroker configuration is up to date for interface " . $InterfaceVal->"name" . ".") false;
+    $LogPrintExit2 debug $0 ("All tunnelbroker configuration is up to date for interface " . $InterfaceVal->"name" . ".") false;
   }
 }
-- 
cgit v1.2.3-54-g00ecf