From e23cf14f33aa06be8d5b8e8f901f54dd4eed1741 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 21 Mar 2011 19:16:46 +0100 Subject: [PATCH] Added error message parsing to im and vmm (cherry picked from commit ca5c0f09f0a7ce68d8c32dfe85731d11751d43d4) --- src/im_mad/im_sh/one_im_sh.rb | 3 ++- src/im_mad/im_ssh/one_im_ssh.rb | 2 +- src/mad/ruby/VirtualMachineDriver.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/im_mad/im_sh/one_im_sh.rb b/src/im_mad/im_sh/one_im_sh.rb index f93d55d6dc..8522b69ddb 100755 --- a/src/im_mad/im_sh/one_im_sh.rb +++ b/src/im_mad/im_sh/one_im_sh.rb @@ -68,7 +68,8 @@ class InformationManager < OpenNebulaDriver send_message("MONITOR", RESULT[:success], number, monitor_exe.stdout) else send_message("MONITOR", RESULT[:failure], number, - "Could not monitor host #{host}.") + "Could not monitor host #{host}. " + + "#{monitor_exe.get_error_message}") end end diff --git a/src/im_mad/im_ssh/one_im_ssh.rb b/src/im_mad/im_ssh/one_im_ssh.rb index 58f937bd3d..8c4a36fcc2 100755 --- a/src/im_mad/im_ssh/one_im_ssh.rb +++ b/src/im_mad/im_ssh/one_im_ssh.rb @@ -83,7 +83,7 @@ class InformationManager < OpenNebulaDriver send_message("MONITOR", RESULT[:success], number, cmd.stdout) else send_message("MONITOR", RESULT[:failure], number, - "Could not monitor host #{host}.") + "Could not monitor host #{host}. #{cmd.get_error_message}") end end diff --git a/src/mad/ruby/VirtualMachineDriver.rb b/src/mad/ruby/VirtualMachineDriver.rb index 500659892a..2a32245dae 100644 --- a/src/mad/ruby/VirtualMachineDriver.rb +++ b/src/mad/ruby/VirtualMachineDriver.rb @@ -121,7 +121,7 @@ class VirtualMachineDriver < OpenNebulaDriver info = command_exe.stdout else result = :failure - info = command_exe.stderr + info = command_exe.get_error_message end info = "-" if info == nil || info.empty?