backup-cloud: catch error with :execute workaround

Catching a runtime error here fails... So let's try a workaround
with :execute...
This commit is contained in:
Christian Hesse 2024-03-04 20:57:34 +01:00
parent 010bea56dc
commit 955ee8499b
4 changed files with 20 additions and 8 deletions

View file

@ -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 ];