Simplify contract between run and helper

Author: fhammerl

src/Misc/layoutbin/run-helper.cmd

@@ -7,33 +7,33 @@ rem `if ERRORLEVEL N` means: error level is N or MORE
 
 if %ERRORLEVEL% EQU 0 (
   echo "Runner listener exit with 0 return code, stop the service, no retry needed."
+exit /b 0
 )
 
 if %ERRORLEVEL% EQU 1 (
   echo "Runner listener exit with terminated error, stop the service, no retry needed."
+exit /b 0
 )
 
 if %ERRORLEVEL% EQU 2 (
   echo "Runner listener exit with retryable error, re-launch runner in 5 seconds."
   timeout /t 5 /nobreak > NUL
-  goto :launch_listener
+  exit /b 1
 )
 
 if %ERRORLEVEL% EQU 3 (
+  rem Sleep 5 seconds to wait for the runner update process finish
   echo "Runner listener exit because of updating, re-launch runner in 5 seconds"
   timeout /t 5 /nobreak > NUL
+  exit /b 1
 )
 
 if %ERRORLEVEL% EQU 4 (
+  rem Sleep 5 seconds to wait for the ephemeral runner update process finish
   echo "Runner listener exit because of updating, re-launch ephemeral runner in 5 seconds"
   timeout /t 5 /nobreak > NUL
+  exit /b 1
 )
 
-if %ERRORLEVEL% GEQ 5 (  
-  echo "Exiting with unknown error code: ${returnCode}"
-)
-if [%ERRORLEVEL%]==[] (  
-  echo "Exiting with empty error code: ${returnCode}"
-)
-
-exit /b %ERRORLEVEL%
+echo "Exiting after unknown error code: %ERRORLEVEL%"
+exit /b 0

src/Misc/layoutbin/run-helper.sh

@@ -30,26 +30,25 @@ bin/Runner.Listener run $*
 returnCode=$?
 if [[ $returnCode == 0 ]]; then
     echo "Runner listener exit with 0 return code, stop the service, no retry needed."
-    echo "0 ORIG"
+    exit 0
 elif [[ $returnCode == 1 ]]; then
     echo "Runner listener exit with terminated error, stop the service, no retry needed."
-    echo "1 ORIG"
+    exit 0
 elif [[ $returnCode == 2 ]]; then
     echo "Runner listener exit with retryable error, re-launch runner in 5 seconds."
-    echo "2 ORIG"
     safe_sleep
+    exit 1
 elif [[ $returnCode == 3 ]]; then
     # Sleep 5 seconds to wait for the runner update process finish
     echo "Runner listener exit because of updating, re-launch runner in 5 seconds"
-    echo "3 ORIG"
     safe_sleep
+    exit 1
 elif [[ $returnCode == 4 ]]; then
     # Sleep 5 seconds to wait for the ephemeral runner update process finish
     echo "Runner listener exit because of updating, re-launch ephemeral runner in 5 seconds"
-    echo "4 ORIG"
     safe_sleep
+    exit 1
 else
     echo "Exiting with unknown error code: ${returnCode}"
+    exit 0
 fi
-
-exit $returnCode

src/Misc/layoutroot/run.cmd

@@ -24,7 +24,7 @@ call "%~dp0bin\run-helper.cmd" %*
 rem using `if %ERRORLEVEL% EQU N` insterad of `if ERRORLEVEL N`
 rem `if ERRORLEVEL N` means: error level is N or MORE
 
-if %ERRORLEVEL% GEQ 2 (
+if %ERRORLEVEL% EQU 1 (
   echo "Restart runner after it exited with return code '%ERRORLEVEL%'"
   goto :launch_helper
 ) else (  

src/Misc/layoutroot/run.sh

@@ -15,10 +15,10 @@ while :;
 do
     "$DIR"/bin/run-helper.sh $*
     returnCode=$?
-    if [[ $returnCode -ge 2 ]]; then
-        echo "Restart runner after it exited with return code '${returnCode}'"
+    if [[ $returnCode -e 1 ]]; then
+        echo "Restart runner after it updated..."
     else
-        echo "Exit runner after it exited with return code '${returnCode}'"
-        exit $returnCode
+        echo "Exiting runner..."
+        exit 0
     fi
 done