Merge branch 'release/0.13.9'

NEWS.md

@@ -1,3 +1,10 @@
+## Version 0.13.9 [2023-10-09]
+
+### Bug Fixes
+
+ * Previous bug fix did not work; the time-out error never took place.
+
+
 ## Version 0.13.8 [2023-10-09]
 
 ### Bug Fixes

README.md

@@ -333,20 +333,20 @@ As before, the RStudio Server is available at
 
 ```sh
 $ cd /path/to/software
-$ curl -L -O https://github.com/UCSF-CBI/rstudio-server-controller/archive/refs/tags/0.13.8.tar.gz
-$ tar xf 0.13.8.tar.gz
-$ PATH=/path/to/softwarerstudio-server-controller-0.13.8/bin:$PATH
+$ curl -L -O https://github.com/UCSF-CBI/rstudio-server-controller/archive/refs/tags/0.13.9.tar.gz
+$ tar xf 0.13.9.tar.gz
+$ PATH=/path/to/softwarerstudio-server-controller-0.13.9/bin:$PATH
 $ export PATH
 $ rsc --version
-0.13.8
+0.13.9
 ```
 
 To verify that the tool can find R and the RStudio Server executables,
 call:
 
 ```sh
 $ rsc --version --full
-rsc: 0.13.8
+rsc: 0.13.9
 RStudio Server: 2023.06.2+561 (Mountain Hydrangea) for Linux [/path/to/rstudio-server/bin/rstudio-server]
 R: 4.3.1 (2023-06-16) -- "Shortstop Beagle" [/path/to/R/bin/R]
 ```

bin/rsc

@@ -63,7 +63,7 @@
 ###  rsc config --full
 ###  rsc log
 ###
-### Version: 0.13.8
+### Version: 0.13.9
 ### Copyright: Henrik Bengtsson (2022-2023) and Harry Putnam (2022)
 ### License: ISC
 
@@ -313,6 +313,7 @@ function remove_stray_pid_file {
     local -i pid
     local rserver_hostname
     local what
+
     what=${1:?}
 
     mdebug "remove_stray_pid_file(what='${what}'):"
@@ -359,7 +360,9 @@ function remove_stray_pid_file {
     mdebug " - hostname=$(hostname)"
 
     ## If this process is not running, remove the PID file
-    if [[ -z $(check_pid "${pid}" "${rserver_hostname}") ]]; then
+    pid=$(check_pid "${pid}" "${rserver_hostname}")
+    relay_condition "${pid}"
+    if [[ -z ${pid} ]]; then
         rm "${pid_file}"
         warn "Detected a stray PID file (${pid_file}). This file was removed, because it referred to a ${what} process (PID ${pid} on ${rserver_hostname}) which is no longer running."
         return 0
@@ -612,6 +615,7 @@ function rs_process_status {
     ## Check if PID is still active?
     if [[ ${pid} -ne 0 ]]; then
         pid=$(check_pid "${pid}" "${hostname}")
+        relay_condition "${pid}"
     fi