Feature #1112: Fix exec_and_log functions

src/mad/sh/scripts_common.sh

@@ -121,7 +121,7 @@ function exec_and_log
         else
             error_message "Error executing $1: $EXEC_LOG_ERR"
         fi
-        exit $code
+        exit $EXEC_LOG_RC
     fi
 }
 

src/tm_mad/tm_common.sh

@@ -88,9 +88,8 @@ $2
 EOF`
     SSH_EXEC_RC=$?
 
-    if [ $? -ne 0 ]; then
-        log_error "Command $2 failed"
-        log_error "$SSH_EXEC_ERR"
+    if [ $SSH_EXEC_RC -ne 0 ]; then
+        log_error "Command \"$2\" failed: $SSH_EXEC_ERR"
 
         if [ -n "$3" ]; then
             error_message "$3"