Skip to content

Commit b8f47e4

Browse files
meisterTvmcj
authored andcommitted
Clean up the cleanup (#2009)
* Fix typo in judgehost cleanup usage. * Allow `pkill` to fail in judgehost cleanup. If you run the cleanup with `all` and there is no process to cleanup it would otherwise stop the cleanup here. (cherry picked from commit c9c2a8d)
1 parent 8c4ce13 commit b8f47e4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

misc-tools/dj_judgehost_cleanup.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ EOF
4040

4141
kill_processes() {
4242
echo "Killing remaining processes..."
43-
pkill -G @RUNGROUP@
43+
pkill -G @RUNGROUP@ || true
4444
echo "Done."
4545
}
4646

@@ -76,7 +76,7 @@ cleanup_judgings() {
7676
if cut -d ' ' -f 2 /proc/mounts | grep -E "^$JUDGINGDIR/" >/dev/null 2>&1; then
7777
echo "There are (stale) bind mounts under $JUDGINGDIR/."
7878
echo "Make sure that all judgedaemons on this host are stopped, and then"
79-
echo "run '$PROGNAME mount' to clean up any stale bind mounts."
79+
echo "run '$PROGNAME mounts' to clean up any stale bind mounts."
8080
exit 1
8181
fi
8282
echo "Cleaning up judging data..."

0 commit comments

Comments
 (0)