From 0a428d87561f72bafd9f2244c91db02308d70cc2 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Thu, 29 Jun 2023 13:38:41 +0200
Subject: [PATCH] update_psa(): if called without -m (without MAINTENANCE):
 check for ISMAS updates 3 times. If no response by ISMAS, end update process
 with FAILURE (exit script) if called with -m: check for ISMAS updates 10
 times. If no response by ISMAS, end update process with FAILURE (exit script)

---
 update_psa_impl | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/update_psa_impl b/update_psa_impl
index 72b167e..221b4b9 100755
--- a/update_psa_impl
+++ b/update_psa_impl
@@ -45,36 +45,48 @@ update_psa() {
     check_sanity_of_repository
     $INITIAL_CLONE && return 0
 
+    local ismas_requests=0
+
     if [ "$MAINTENANCE" = "NO" ]; then
-        log_info "update_psa:${LINENO}: MAINTENANCE OFF. Checking for updates..."
+        log_info "${func}:${LINENO}: MAINTENANCE OFF. Checking for updates..."
         # someone must have activated the WAIT-button in ISMAS. 
         # Request the status of this button in updates_available().
-        if ! updates_available; then 
-            update_psa_false_alarm "update requested, but no WAIT state detected !!!"
+        while [ $ismas_requests -le 3 ]; do
+	    ismas_requests=$(( $ismas_requests + 1 ))
+            updates_available && break
+            update_psa_false_alarm "update requested, but no WAIT state detected <$ismas_requests>"
+        done
+        if [ $ismas_requests -gt 3 ]; then
             log_fatal "update_psa:${LINENO}: update requested, but no WAIT state detected !!!"
         fi
     else
-        # simulate an activated WAIT-button
+        log_info "${func}:${LINENO}: MAINTENANCE ON. Emulate ISMAS updates..."
+        # simulate an activated WAIT-button in ISMAS
         set_updates_available
-        while :
-        do
+        while [ $ismas_requests -le 10 ]; do
             sleep 5
             updates_available && break
+	    ismas_requests=$(( $ismas_requests + 1 ))
+	    log_info "${func}:${LINENO}: updates_requested <$ismas_requests>"
         done 
+        if [ $ismas_requests -gt 10 ]; then
+	    log_fatal "${func}:${LINENO}: NO ISMAS UPDATES AVAILABLE"
+        fi
     fi
 
-    log_debug "$func:${LINENO}: fetch/merge updates..."
+    log_debug "$func:${LINENO}: before fetch/merge updates..."
    
     # Fetch new updates (using git). but only when repository has already been
     # cloned.
     if ! fetch_customer_updates; then
-        log_error "$func:${LINENO}: fetch no data for $customer_id"\
-	    "-> no files to update -> no psa update"
         update_psa_false_alarm \
 	    "update request, but no change in $CUSTOMER_REPOSITORY_PATH"
-        # TODO
+        log_fatal "$func:${LINENO}: fetch no data for $customer_id"\
+	    "-> no files to update -> no psa update"
+    else
+    	log_debug "$func:${LINENO}: after successful fetch_customer_repository..."
     fi
-            
+
     update_psa_pull_customer_repository # message to ISMAS
 }