qrexec: write service stderr to both syslog and caller
In case of some services it makes much sense for caller to receive also stderr in addition to stdout. For example: - qubes.VMShell (stderr required for salt-ssh over qrexec) - qubes.OpenInVM - especially when called to DispVM - otherwise diagnosing errors can be hard And generally all sort of error reporting (the purpose of stderr). It would ease debugging - instead of message "error occurred, check here and there for more details", it could be "error occurred: the reason". Fixes QubesOS/qubes-issues#1808
This commit is contained in:
parent
d181cf5cff
commit
b267e5c305
@ -1,9 +1,18 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
mkfifo /tmp/qrexec-rpc-stderr.$$
|
# write stderr to both calling party and local log; be very careful about
|
||||||
logger -t "$1-$2" -f /tmp/qrexec-rpc-stderr.$$ >/dev/null 2>&1 </dev/null &
|
# closing file descriptors here - if either stdout or stderr will not be closed
|
||||||
exec 2>/tmp/qrexec-rpc-stderr.$$
|
# when service process does the same - service call will hang (waiting for EOF
|
||||||
rm -f /tmp/qrexec-rpc-stderr.$$
|
# on stdout/stderr)
|
||||||
|
stderr_pipe=/tmp/qrexec-rpc-stderr.$$
|
||||||
|
mkfifo $stderr_pipe
|
||||||
|
# tee can't write to file descriptor, nor /proc/self/fd/2 (EXIO on open)
|
||||||
|
return_stderr_pipe=/tmp/qrexec-rpc-stderr-return.$$
|
||||||
|
mkfifo $return_stderr_pipe
|
||||||
|
{ cat <$return_stderr_pipe >&2 2>/dev/null; rm -f $return_stderr_pipe; } &
|
||||||
|
{ tee $return_stderr_pipe 2>/dev/null <$stderr_pipe |\
|
||||||
|
logger -t "$1-$2" >/dev/null 2>&1; rm -f $stderr_pipe; } &
|
||||||
|
exec 2>$stderr_pipe
|
||||||
|
|
||||||
QUBES_RPC=/etc/qubes-rpc
|
QUBES_RPC=/etc/qubes-rpc
|
||||||
LOCAL_QUBES_RPC=/usr/local/etc/qubes-rpc
|
LOCAL_QUBES_RPC=/usr/local/etc/qubes-rpc
|
||||||
|
Loading…
Reference in New Issue
Block a user