Extract the logic from run.cmd

Author: Ferenc Hammerl

src/Misc/layoutbin/run-helper.cmd

@@ -0,0 +1,34 @@
+@echo off
+
+"%~dp0Runner.Listener.exe" run %*
+
+rem using `if %ERRORLEVEL% EQU N` insterad of `if ERRORLEVEL N`
+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."
+)
+
+if %ERRORLEVEL% EQU 1 (
+  echo "Runner listener exit with terminated error, stop the service, no retry needed."
+)
+
+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
+)
+
+rem Return code 4 means the runner received an update message.
+if %ERRORLEVEL% EQU 3 (
+  echo "Runner listener exit because of updating, re-launch runner in 5 seconds"
+  timeout /t 5 /nobreak > NUL
+)
+
+rem Return code 4 means the ephemeral runner received an update message.
+if %ERRORLEVEL% EQU 4 (
+  echo "Runner listener exit because of updating, re-launch ephemeral runner in 5 seconds"
+  timeout /t 5 /nobreak > NUL
+)
+
+exit /b %ERRORLEVEL%

src/Misc/layoutroot/run.cmd

@@ -18,38 +18,17 @@ rem ****************************************************************************
 rem Run.
 rem ********************************************************************************
 
-:launch_listener
-"%~dp0bin\Runner.Listener.exe" run %*
+:launch_helper
+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% EQU 0 (
-  echo "Runner listener exit with 0 return code, stop the service, no retry needed."
+if %ERRORLEVEL% GEQ 2 (
+  echo "Restart runner after it exited with return code '%ERRORLEVEL%'"
+  goto :launch_helper
+) else (  
+  echo "Exit runner after it exited with return code '%ERRORLEVEL%'"
   exit %ERRORLEVEL%
 )
-
-if %ERRORLEVEL% EQU 1 (
-  echo "Runner listener exit with terminated error, stop the service, no retry needed."
-  exit %ERRORLEVEL%
-)
-
-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
-)
-
-rem Return code 4 means the runner received an update message.
-if %ERRORLEVEL% EQU 3 (
-  echo "Runner listener exit because of updating, re-launch runner in 5 seconds"
-  timeout /t 5 /nobreak > NUL
-  goto :launch_listener
-)
-
-rem Return code 4 means the ephemeral runner received an update message.
-if %ERRORLEVEL% EQU 4 (
-  echo "Runner listener exit because of updating, re-launch ephemeral runner in 5 seconds"
-  timeout /t 5 /nobreak > NUL
-  goto :launch_listener
-)
+exit %ERRORLEVEL%