Merge pull request #358 from advancedtelematic/feat/bump-aktualizr-pro-h#3-master

Feat/bump aktualizr pro h#3 master

2 files changed, 16 insertions, 3 deletions

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"
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)