diff --git a/src/datastore_mad/remotes/vcenter/clone b/src/datastore_mad/remotes/vcenter/clone index 1fa69dfe99..762e98db82 100755 --- a/src/datastore_mad/remotes/vcenter/clone +++ b/src/datastore_mad/remotes/vcenter/clone @@ -73,7 +73,9 @@ begin rescue Exception => e message = "Error cloning img #{src_path} to #{target_ds_name}"\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/mkfs b/src/datastore_mad/remotes/vcenter/mkfs index de07dee2b9..09e48c441f 100755 --- a/src/datastore_mad/remotes/vcenter/mkfs +++ b/src/datastore_mad/remotes/vcenter/mkfs @@ -75,7 +75,9 @@ begin rescue Exception => e message = "Error creating virtual disk #{img_name}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/monitor b/src/datastore_mad/remotes/vcenter/monitor index 1dae1e5107..ad2eec3b5c 100755 --- a/src/datastore_mad/remotes/vcenter/monitor +++ b/src/datastore_mad/remotes/vcenter/monitor @@ -61,7 +61,9 @@ begin rescue Exception => e message = "Error monitoring datastore #{id}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm index 72fdf0080e..8e849adb73 100755 --- a/src/datastore_mad/remotes/vcenter/rm +++ b/src/datastore_mad/remotes/vcenter/rm @@ -88,7 +88,9 @@ rescue Exception => e if !e.message.start_with?('FileNotFound') message = "Error deleting virtual disk #{img_src}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 end ensure diff --git a/src/tm_mad/vcenter/clone b/src/tm_mad/vcenter/clone index c41a7ab4b9..3182493066 100755 --- a/src/tm_mad/vcenter/clone +++ b/src/tm_mad/vcenter/clone @@ -110,7 +110,9 @@ rescue Exception => e message = "Error clone virtual disk #{src_path} in "\ "datastore #{target_ds_name_vc}. "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds index 6463c7cd92..e29474ab14 100755 --- a/src/tm_mad/vcenter/cpds +++ b/src/tm_mad/vcenter/cpds @@ -92,7 +92,9 @@ begin rescue Exception => e message = "Error copying img #{src_path} to #{target_ds_name_vc} "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete index 38b8a42123..a0f017d440 100755 --- a/src/tm_mad/vcenter/delete +++ b/src/tm_mad/vcenter/delete @@ -104,6 +104,9 @@ begin rescue Exception => e vi_client.close_connection if vi_client - STDERR.puts "#{@error_message}. Reason: #{e.message}\n#{e.backtrace}" + message = "#{@error_message}. Reason: #{e.message}\n#{e.backtrace}" + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 end diff --git a/src/tm_mad/vcenter/mkimage b/src/tm_mad/vcenter/mkimage index eb8192dc50..a06a5246f3 100755 --- a/src/tm_mad/vcenter/mkimage +++ b/src/tm_mad/vcenter/mkimage @@ -88,7 +88,9 @@ begin rescue Exception => e message = "Error creating virtual disk in #{ds_vc['name']}."\ " Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/mv b/src/tm_mad/vcenter/mv index 832e92200a..19b2b280e6 100755 --- a/src/tm_mad/vcenter/mv +++ b/src/tm_mad/vcenter/mv @@ -58,5 +58,7 @@ rescue StandardError => e 'failed due to '\ "\"#{e.message}\"\n" OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) end diff --git a/src/tm_mad/vcenter/mvds b/src/tm_mad/vcenter/mvds index c324c7c0f9..d4cc5b8e74 100755 --- a/src/tm_mad/vcenter/mvds +++ b/src/tm_mad/vcenter/mvds @@ -80,7 +80,9 @@ begin rescue Exception => e message = "Error detaching virtual disk #{disk_id} from vm #{vmid}."\ " Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/resize b/src/tm_mad/vcenter/resize index 349738ab1e..3c30a2062f 100755 --- a/src/tm_mad/vcenter/resize +++ b/src/tm_mad/vcenter/resize @@ -72,7 +72,9 @@ begin rescue Exception => e message = "Error resizing disk #{disk_id} for VM #{one_vm["NAME"]} "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client