File tree Expand file tree Collapse file tree 3 files changed +7
-3
lines changed Expand file tree Collapse file tree 3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -206,7 +206,7 @@ sublog() {
206
206
verbose " $1 now present on disk"
207
207
208
208
# Then reroute its content through our logging printf style
209
- tail -n +0 -f " $1 " | while IFS= read -r line; do
209
+ tail -n +0 -f " $1 " 2> /dev/null | while IFS= read -r line; do
210
210
if [ -n " $line " ]; then
211
211
printf ' [%s] [%s] %s\n' \
212
212
" ${2:- } @${KRUNVM_RUNNER_BIN:- $(basename " $0 " )} " \
Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ cleanup() {
93
93
94
94
for pid in $ORCHESTRATOR_PIDS ; do
95
95
verbose " Killing runner loop $pid "
96
- kill " $pid "
96
+ kill " $pid " 2> /dev/null || true
97
97
done
98
98
verbose " Waiting for runners to die"
99
99
# shellcheck disable=SC2086 # We want to wait for all pids
Original file line number Diff line number Diff line change @@ -236,7 +236,11 @@ runner_unregister() {
236
236
trap - INT TERM EXIT
237
237
238
238
# Remember or request (again) a runner registration token
239
- verbose " Caught termination signal, unregistering runner"
239
+ if [ " ${1:- 0} " = " 1" ]; then
240
+ verbose " Caught termination signal/request, unregistering runner"
241
+ else
242
+ verbose " Caught regular exit signal, unregistering runner"
243
+ fi
240
244
if [ -n " ${RUNNER_PAT:- } " ]; then
241
245
if [ -n " ${RUNNER_TOKENFILE:- } " ] && [ -f " $RUNNER_TOKENFILE " ]; then
242
246
verbose " Reading runner token from $RUNNER_TOKENFILE "
You can’t perform that action at this time.
0 commit comments