aboutsummaryrefslogtreecommitdiffstats
path: root/backup-cloud.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-04 20:57:34 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit955ee8499b9fe63c332431c2a7fc0488bd2ac315 (patch)
treec68834dbb6b6289b31ebbe7beca067e50d8b6da2 /backup-cloud.rsc
parent010bea56dca6b501978f57ef4a830a7dad497833 (diff)
backup-cloud: catch error with :execute workaroundchange-120
Catching a runtime error here fails... So let's try a workaround with :execute...
Diffstat (limited to 'backup-cloud.rsc')
-rw-r--r--backup-cloud.rsc17
1 files changed, 14 insertions, 3 deletions
diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index 418e68d..5dd4bf1 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -15,7 +15,6 @@
:local Main do={
:local ScriptName [ :tostr $1 ];
- :global BackupPassword;
:global BackupRandomDelay;
:global Identity;
@@ -23,11 +22,13 @@
:global FormatLine;
:global HumanReadableNum;
:global LogPrintExit2;
+ :global MkDir;
:global RandomDelay;
:global ScriptFromTerminal;
:global ScriptLock;
:global SendNotification2;
:global SymbolForNotification;
+ :global WaitForFile;
:global WaitFullyConnected;
:if ([ $ScriptLock $ScriptName ] = false) do={
@@ -39,7 +40,12 @@
$RandomDelay $BackupRandomDelay;
}
- :do {
+ :if ([ $MkDir ("tmpfs/backup-cloud") ] = false) do={
+ $LogPrintExit2 error $ScriptName ("Failed creating directory!") true;
+ }
+
+ :execute {
+ :global BackupPassword;
# we are not interested in output, but print is
# required to fetch information from cloud
/system/backup/cloud/print as-value;
@@ -50,6 +56,10 @@
/system/backup/cloud/upload-file action=create-and-upload \
password=$BackupPassword;
}
+ /file/add name="tmpfs/backup-cloud/done";
+ } as-string;
+
+ :if ([ $WaitForFile "tmpfs/backup-cloud/done" ] = true) do={
:local Cloud [ /system/backup/cloud/get ([ find ]->0) ];
$SendNotification2 ({ origin=$ScriptName; \
@@ -59,12 +69,13 @@
[ $FormatLine "Name" ($Cloud->"name") ] . "\n" . \
[ $FormatLine "Size" ([ $HumanReadableNum ($Cloud->"size") 1024 ] . "iB") ] . "\n" . \
[ $FormatLine "Download key" ($Cloud->"secret-download-key") ]); silent=true });
- } on-error={
+ } else={
$SendNotification2 ({ origin=$ScriptName; \
subject=([ $SymbolForNotification "floppy-disk,warning-sign" ] . "Cloud backup failed"); \
message=("Failed uploading backup for " . $Identity . " to cloud!\n\n" . [ $DeviceInfo ]) });
$LogPrintExit2 error $ScriptName ("Failed uploading backup for " . $Identity . " to cloud!") true;
}
+ /file/remove "tmpfs/backup-cloud";
}
$Main [ :jobname ];