github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix buffer_output to actually handle interrupts

pull/6/head
Karl Isenberg 2016-01-05 17:57:04 -08:00
parent acef0404e5
commit ff0a2871f3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/mesos/docker/util.sh
View File

@ -401,12 +401,14 @@ function cluster::mesos::docker::buffer_output {
local cmd="$@" local cmd="$@"
local tempfile="$(mktemp "${TMPDIR:-/tmp}/buffer.XXXXXX")" local tempfile="$(mktemp "${TMPDIR:-/tmp}/buffer.XXXXXX")"
trap "kill -TERM \${PID}; rm '${tempfile}'" TERM INT trap "kill -TERM \${PID}; rm '${tempfile}'" TERM INT
set +e
${cmd} &> "${tempfile}" & ${cmd} &> "${tempfile}" &
PID=$! PID=$!
wait ${PID} wait ${PID}
trap - TERM INT trap - TERM INT
wait ${PID} wait ${PID}
local exit_status="$?" local exit_status="$?"
set -e
if [ "${exit_status}" != 0 ]; then if [ "${exit_status}" != 0 ]; then
cat "${tempfile}" 1>&2 cat "${tempfile}" 1>&2
fi fi