From 9f139f3d34c7c87733d77f300528df3951c97afd Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Mon, 9 Oct 2023 15:55:07 -0700 Subject: [PATCH 1/3] BUG FIX: Now relaying check_pid() errors --- bin/rsc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/rsc b/bin/rsc index 6de86cc..906b5ef 100755 --- a/bin/rsc +++ b/bin/rsc @@ -63,7 +63,7 @@ ### rsc config --full ### rsc log ### -### Version: 0.13.8 +### Version: 0.13.8-9001 ### 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 From c102467e300af4c3df005fd5bb1fcc097f8626e3 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Mon, 9 Oct 2023 16:02:11 -0700 Subject: [PATCH 2/3] Update NEWS --- NEWS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.md b/NEWS.md index ba00165..56ecf64 100644 --- a/NEWS.md +++ b/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 From 06dd462deabc7105edc0bff19a96223fdf203772 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Mon, 9 Oct 2023 16:03:03 -0700 Subject: [PATCH 3/3] rsc 0.13.9 --- README.md | 10 +++++----- bin/rsc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 151c214..4c7d979 100644 --- a/README.md +++ b/README.md @@ -333,12 +333,12 @@ 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, @@ -346,7 +346,7 @@ 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] ``` diff --git a/bin/rsc b/bin/rsc index 906b5ef..0bbb8cf 100755 --- a/bin/rsc +++ b/bin/rsc @@ -63,7 +63,7 @@ ### rsc config --full ### rsc log ### -### Version: 0.13.8-9001 +### Version: 0.13.9 ### Copyright: Henrik Bengtsson (2022-2023) and Harry Putnam (2022) ### License: ISC