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

---
 upload-backup | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'upload-backup')

diff --git a/upload-backup b/upload-backup
index e16a4e5..1e3e8e8 100644
--- a/upload-backup
+++ b/upload-backup
@@ -6,6 +6,7 @@
 # create and upload backup and config file
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/upload-backup.md
 
+:local 0 "upload-backup";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
@@ -21,7 +22,7 @@
 :global CharacterReplace;
 :global DeviceInfo;
 :global IfThenElse;
-:global LogPrintExit;
+:global LogPrintExit2;
 :global SendNotification;
 :global SymbolForNotification;
 :global WaitForFile;
@@ -31,7 +32,7 @@ $WaitFullyConnected;
 
 :if ($BackupSendBinary != true && \
      $BackupSendExport != true) do={
-  $LogPrintExit error ("Configured to send neither backup nor config export.") true;
+  $LogPrintExit2 error $0 ("Configured to send neither backup nor config export.") true;
 }
 
 # filename based on identity
@@ -50,7 +51,7 @@ $WaitFullyConnected;
         user=$BackupUploadUser password=$BackupUploadPass src-path=($FileName . ".backup");
     :set BackupFile ($FileName . ".backup");
   } on-error={
-    $LogPrintExit error ("Uploading backup file failed!") false;
+    $LogPrintExit2 error $0 ("Uploading backup file failed!") false;
     :set BackupFile "failed";
     :set Failed 1;
   }
@@ -66,7 +67,7 @@ $WaitFullyConnected;
         user=$BackupUploadUser password=$BackupUploadPass src-path=($FileName . ".rsc");
     :set ConfigFile ($FileName . ".rsc");
   } on-error={
-    $LogPrintExit error ("Uploading configuration export failed!") false;
+    $LogPrintExit2 error $0 ("Uploading configuration export failed!") false;
     :set ConfigFile "failed";
     :set Failed 1;
   }
-- 
cgit v1.2.3-54-g00ecf