Skip to content

Commit 9506d1e

Browse files
If 'rsc start --force' fails, suggest 'rsc reset --force' as a last resort
1 parent f9c72ff commit 9506d1e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

bin/rsc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
### rsc config --full
6464
### rsc log
6565
###
66-
### Version: 0.14.1-9004
66+
### Version: 0.14.1-9005
6767
### Copyright: Henrik Bengtsson (2022-2023) and Harry Putnam (2022)
6868
### License: ISC
6969

@@ -270,7 +270,9 @@ function acquire_lock_file {
270270

271271
lockfile=${workdir}/pid.lock
272272
if [[ -f "${lockfile}" ]]; then
273-
error "${USER}, another RStudio Server instance of yours is already running on $(rserver_hostname) on this system. Call '${blue}rsc status --full${undo}' for details on how to reconnect. If you want to start a new instance, please terminate the existing one first by calling '${blue}rsc stop${undo}' from that machine."
273+
msg="${USER}, another RStudio Server instance of yours is already running on $(rserver_hostname) on this system. Call '${blue}rsc status --full${undo}' for details on how to reconnect. If you want to start a new instance, please terminate the existing one first by calling '${blue}rsc stop${undo}' from that machine."
274+
msg="${msg} As a last resort, for instance, if that machine is no longer available or down for maintenance, try ${blue}rsc reset --force${undo}."
275+
error "${msg}"
274276
fi
275277
echo "${PPID}" > "${lockfile}"
276278
}

0 commit comments

Comments
 (0)