fix broken pipe
This commit is contained in:
parent
5280224a9c
commit
d1c32d32c6
@ -1,6 +1,5 @@
|
|||||||
function g_python {
|
function g_python {
|
||||||
|
|
||||||
unset g_python_result
|
|
||||||
g_rnd=$$
|
g_rnd=$$
|
||||||
|
|
||||||
local g_python_jobs
|
local g_python_jobs
|
||||||
@ -8,56 +7,58 @@ function g_python {
|
|||||||
|
|
||||||
# Use python in backround for multiple python commands running much faster
|
# Use python in backround for multiple python commands running much faster
|
||||||
#if [ -z "${g_python_running}" ]
|
#if [ -z "${g_python_running}" ]
|
||||||
if ! [[ ${g_python_jobs[*]} =~ python-pipeexec.py ]]
|
if [[ ${g_python_jobs[*]} != *python-pipeexec.py* ]]
|
||||||
then
|
then
|
||||||
mkdir -p ${g_tmp}/${g_rnd}
|
mkdir -p ${g_tmp}/${g_rnd}
|
||||||
if [ -s ${g_tmp}/${g_rnd}/python-error ]
|
if [ -s ${g_tmp}/${g_rnd}/python-error ]
|
||||||
then
|
then
|
||||||
g_echo_error "From last python run: $(cat ${g_tmp}/${g_rnd}/python-error)"
|
g_echo_error "From last python run: $(cat ${g_tmp}/${g_rnd}/python-error)"
|
||||||
rm -f ${g_tmp}/${g_rnd}/python-error
|
|
||||||
fi
|
fi
|
||||||
[ -p ${g_tmp}/${g_rnd}/python-in ] || mkfifo ${g_tmp}/${g_rnd}/python-in
|
[ -p ${g_tmp}/${g_rnd}/python-in ] || mkfifo ${g_tmp}/${g_rnd}/python-in
|
||||||
[ -p ${g_tmp}/${g_rnd}/python-out ] || mkfifo ${g_tmp}/${g_rnd}/python-out
|
#[ -p ${g_tmp}/${g_rnd}/python-out ] || mkfifo ${g_tmp}/${g_rnd}/python-out
|
||||||
echo "while 1:
|
echo "while 1:
|
||||||
exec(open(\"${g_tmp}/${g_rnd}/python-in\").read())
|
exec(open(\"${g_tmp}/${g_rnd}/python-in\").read())
|
||||||
|
print('DONE')
|
||||||
" >${g_tmp}/${g_rnd}/python-pipeexec.py
|
" >${g_tmp}/${g_rnd}/python-pipeexec.py
|
||||||
|
|
||||||
# python stream channel
|
# python stream channel
|
||||||
{ python3 -u ${g_tmp}/${g_rnd}/python-pipeexec.py >${g_tmp}/${g_rnd}/python-out 2>${g_tmp}/${g_rnd}/python-error & }
|
{ python3 -u ${g_tmp}/${g_rnd}/python-pipeexec.py >>${g_tmp}/${g_rnd}/python-out 2>>${g_tmp}/${g_rnd}/python-error & }
|
||||||
g_python_running="true"
|
g_python_running="true"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# do python
|
# do python
|
||||||
echo "$@" >${g_tmp}/${g_rnd}/python-in &
|
>${g_tmp}/${g_rnd}/python-out
|
||||||
sleep 0.02
|
>${g_tmp}/${g_rnd}/python-error
|
||||||
|
echo $@ >${g_tmp}/${g_rnd}/python-in
|
||||||
|
|
||||||
mapfile -t g_python_jobs < <(jobs -r)
|
while true
|
||||||
if ! [[ ${g_python_jobs[*]} =~ python-pipeexec.py ]]
|
do
|
||||||
then
|
|
||||||
g_echo_error "$(cat ${g_tmp}/${g_rnd}/python-error)"
|
# Check for output
|
||||||
rm ${g_tmp}/${g_rnd}/python-error
|
if [ -s ${g_tmp}/${g_rnd}/python-out ]
|
||||||
unset g_python_running
|
then
|
||||||
return 1
|
unset g_python_result
|
||||||
fi
|
mapfile -t g_python_result <${g_tmp}/${g_rnd}/python-out
|
||||||
|
if [[ ${g_python_result[-1]} == DONE ]]
|
||||||
|
then
|
||||||
|
# remove the DONE output (last array element
|
||||||
|
unset g_python_result[-1]
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "$g_python_waitforoutput" ]
|
# Check for error
|
||||||
then
|
mapfile -t g_python_jobs < <(jobs -r)
|
||||||
until [ -n "$g_python_result" ]
|
if [ -s "${g_tmp}/${g_rnd}/python-error" ] || [[ ${g_python_jobs[*]} != *python-pipeexec.py* ]]
|
||||||
do
|
then
|
||||||
read -t 0.2 g_python_result <${g_tmp}/${g_rnd}/python-out
|
g_echo_error "Python Progress not running:
|
||||||
[ -s "${g_tmp}/${g_rnd}/python-error" ] && break
|
$(cat ${g_tmp}/${g_rnd}/python-error)"
|
||||||
done
|
return 1
|
||||||
unset g_python_waitforoutput
|
fi
|
||||||
else
|
|
||||||
read -t0.2 g_python_result <${g_tmp}/${g_rnd}/python-out
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -s "${g_tmp}/${g_rnd}/python-error" ]
|
# sleep a short time
|
||||||
then
|
sleep 0.1
|
||||||
g_echo_error "$(cat ${g_tmp}/${g_rnd}/python-error)"
|
done
|
||||||
rm ${g_tmp}/${g_rnd}/python-error
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user