From 96fbb41b7e39ffe15ebb22f493eee0a1b910f55b Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 15 Oct 2018 10:01:02 +0200 Subject: [PATCH] daily-psk: add error handling for fetch --- daily-psk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/daily-psk b/daily-psk index 0162ff7..37302d8 100644 --- a/daily-psk +++ b/daily-psk @@ -13,7 +13,7 @@ # return pseudo-random string for PSK :local GeneratePSK do={ - :local date $1; + :local date [ :tostr $1 ]; :global "daily-psk-secrets"; @@ -84,9 +84,14 @@ "&level=1" . \ "&ssid=" . $ssid . \ "&pass=" . $newpsk); + :local attach "qrcode-daily.png"; - / tool fetch mode=https check-certificate=yes-without-crl address=$host host=$host \ - src-path=$srcpath dst-path=qrcode-daily.png; + :do { + / tool fetch mode=https check-certificate=yes-without-crl address=$host \ + host=$host src-path=$srcpath dst-path=$attach; + } on-error={ + :set attach ""; + } $SendNotification ("[" . $identity . "] daily PSK " . $ssid) \ ("This is the daily PSK on " . $identity . ":\n\n" . \ @@ -94,7 +99,7 @@ "PSK: " . $newpsk . "\n" . \ "Date: " . [ / system clock get date ] . "\n\n" . \ "https://" . $host . $srcpath) \ - "qrcode-daily.png"; + $attach; } } else={ :log debug ("Missing active interface " . $intname . " for access list entry.");