Skip to content

Commit e79d9ff

Browse files
More informatice 'rsc stop' error message
1 parent d26975d commit e79d9ff

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
### Miscellaneous
44

5+
* Now the error message that `rsc stop` produces when it failed to
6+
stop an RStudio Server instance running on another machine, will
7+
report on both the machine where it thinks RStudio is running and
8+
the current machine.
9+
510
* Now `rsc` assert that all files it creates are non-empty. This
611
helps troubleshooting obscure errors, e.g. when user runs out of
712
disk space.

bin/rsc

Lines changed: 2 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.16.0-9004
66+
### Version: 0.16.0-9005
6767
### Copyright: Henrik Bengtsson (2022-2024) and Harry Putnam (2022)
6868
### License: ISC
6969

@@ -1792,7 +1792,7 @@ elif [[ "${action}" == "stop" ]]; then
17921792
lockfile=${workdir}/pid.lock
17931793
## If running, make sure we're stopping from the correct machine
17941794
if [[ -f "${lockfile}" ]] && [[ "$(hostname)" != "$(rserver_hostname)" ]]; then
1795-
error "Stopping the RStudio Server can only be made from the machine ($(rserver_hostname)) where it was started from"
1795+
error "Stopping the RStudio Server can only be made from the machine ($(rserver_hostname)) where it was started from - not from $(hostname)"
17961796
fi
17971797

17981798
## Terminate rsession

0 commit comments

Comments
 (0)