shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

bug #4366: preserve line breaks in monitor_and_log

Browse Source
This commit is contained in:
Javi Fontan 2016-04-26 15:44:30 +02:00
parent 03b7b77ce8
commit b0f67a3598
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mad/sh/scripts_common.sh
View File

@ -157,12 +157,13 @@ function exec_and_log
# the command fails
function monitor_and_log
{
EXEC_OUT=`bash -s 2>/dev/null <<EOF
EXEC_OUT="$(bash -s 2>/dev/null <<EOF
export LANG=C
export LC_ALL=C
set -xv
$1
EOF`
EOF
)"
EXEC_RC=$?
if [ $EXEC_RC -ne 0 ]; then
@ -176,7 +177,7 @@ EOF`
exit $EXEC_RC
fi
echo $EXEC_OUT
echo "$EXEC_OUT"
}
# Executes a command, if it fails returns error message and exits. Similar to
@ -410,11 +411,12 @@ EOF`
# the command fails
function ssh_monitor_and_log
{
SSH_EXEC_OUT=`$SSH $1 sh -s 2>/dev/null <<EOF
SSH_EXEC_OUT="$($SSH $1 sh -s 2>/dev/null <<EOF
export LANG=C
export LC_ALL=C
$2
EOF`
EOF
)"
SSH_EXEC_RC=$?
if [ $SSH_EXEC_RC -ne 0 ]; then
@ -428,7 +430,7 @@ EOF`
exit $SSH_EXEC_RC
fi
echo $SSH_EXEC_OUT
echo "$SSH_EXEC_OUT"
}
#Creates path ($2) at $1