From 2420cf3aa7dbf606dd6da3fa279d229fd7697e15 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 20 Feb 2015 20:28:07 +0100
Subject: [PATCH] Feature #3574: Improve error message reporting in
 ssh_monitor_and_log

---
 src/mad/sh/scripts_common.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index 7288e0e9e0..edda6d63c5 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -358,7 +358,9 @@ EOF`
     fi
 }
 
-#This function executes $2 at $1 host and returns stdout
+# This function executes $2 at $1 host and returns stdout
+# If $3 is present, it is used as the error message when
+# the command fails
 function ssh_monitor_and_log
 {
     SSH_EXEC_OUT=`$SSH $1 sh -s 2>/dev/null <<EOF
@@ -369,8 +371,12 @@ EOF`
     SSH_EXEC_RC=$?
 
     if [ $SSH_EXEC_RC -ne 0 ]; then
-        log_error "Command \"$2\" failed: $SSH_EXEC_OUT"
-        error_message "Cannot monitor $1"
+
+        if [ -n "$3" ]; then
+            log_error "Command \"$3\" failed: $SSH_EXEC_OUT"
+        else
+            log_error "Command \"$2\" failed: $SSH_EXEC_OUT"
+        fi
 
         exit $SSH_EXEC_RC
     fi