From 0f1a7232b89aedf2f78984c3146ed2f6c0e4de05 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 17 Jul 2018 09:40:19 +0200 Subject: aktualizr: bump to latest for PRO-H#3 sprint. --- recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index ac3e070..52a69f8 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -26,7 +26,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "72abac76184c84b9a5beb0dfbb103a13b9bfb2ae" +SRCREV = "e9faff35ffa8c31cbf3c5fb1c3c6ed4f5f50e500" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From f58f82942cb414af358dab00f1bd516374712512 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 17 Jul 2018 09:34:06 +0200 Subject: aktualizr: retry garage-sign version check and handle errors better. --- recipes-sota/aktualizr/garage-sign-version.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/recipes-sota/aktualizr/garage-sign-version.inc b/recipes-sota/aktualizr/garage-sign-version.inc index f2d04e8..1b89a3d 100644 --- a/recipes-sota/aktualizr/garage-sign-version.inc +++ b/recipes-sota/aktualizr/garage-sign-version.inc @@ -11,8 +11,21 @@ python () { url = url_file.read().decode().strip(' \t\n') + '/health/version' except (KeyError, ValueError, RuntimeError): return - r = urllib.request.urlopen(url) - if r.code != 200: + connected = False + tries = 3 + for i in range(tries): + try: + r = urllib.request.urlopen(url) + if r.code == 200: + connected = True + break + else: + print('Bad return code from server ' + url + ': ' + str(r.code) + + ' (attempt ' + str(i + 1) + ' of ' + str(tries) + ')') + except urllib.error.URLError as e: + print('Error connecting to server ' + url + ': ' + str(e) + + ' (attempt ' + str(i + 1) + ' of ' + str(tries) + ')') + if not connected: return resp = r.read().decode('utf-8') j = json.loads(resp) -- cgit v1.2.3-54-g00ecf