diff --git a/src/datastore_mad/remotes/vcenter/clone b/src/datastore_mad/remotes/vcenter/clone index 3fe035ffe7..bde317746b 100755 --- a/src/datastore_mad/remotes/vcenter/clone +++ b/src/datastore_mad/remotes/vcenter/clone @@ -68,8 +68,9 @@ begin puts ds.copy_virtual_disk(src_path, target_ds_vc, target_path) rescue Exception => e - STDERR.puts "Error cloning img #{src_path} to #{target_ds_name}"\ - " Reason: \"#{e.message}\"\n#{e.backtrace}" + message = "Error cloning img #{src_path} to #{target_ds_name}"\ + " Reason: \"#{e.message}\"\n#{e.backtrace}" + STDERR.puts error_message(message) exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/export b/src/datastore_mad/remotes/vcenter/export index ed8c1217ac..5acb7372d4 100755 --- a/src/datastore_mad/remotes/vcenter/export +++ b/src/datastore_mad/remotes/vcenter/export @@ -50,8 +50,9 @@ ds_name = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/NAME"] if img_source.nil? - STDERR.puts "Not enough information to export the image,"\ - " missing image source." + message = "Not enough information to export the image,"\ + " missing image source." + STDERR.puts error_message(message) exit -1 end diff --git a/src/datastore_mad/remotes/vcenter/mkfs b/src/datastore_mad/remotes/vcenter/mkfs index b91fba3630..ae48cad71f 100755 --- a/src/datastore_mad/remotes/vcenter/mkfs +++ b/src/datastore_mad/remotes/vcenter/mkfs @@ -74,8 +74,9 @@ begin puts ds.create_virtual_disk(img_name, size, adapter_type, disk_type) rescue Exception => e - STDERR.puts "Error creating virtual disk #{img_name}."\ - " Reason: \"#{e.message}\"\n#{e.backtrace}" + message = "Error creating virtual disk #{img_name}."\ + " Reason: \"#{e.message}\"\n#{e.backtrace}" + STDERR.puts error_message(message) 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 90cc315971..bbca555fd0 100755 --- a/src/datastore_mad/remotes/vcenter/monitor +++ b/src/datastore_mad/remotes/vcenter/monitor @@ -55,8 +55,9 @@ begin puts storage.monitor rescue Exception => e - STDERR.puts "Error monitoring host #{id}."\ - " Reason: \"#{e.message}\"\n#{e.backtrace}" + message = "Error monitoring host #{id}."\ + " Reason: \"#{e.message}\"\n#{e.backtrace}" + STDERR.puts error_message(message) 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 9e17e9f3df..2b67d53723 100755 --- a/src/datastore_mad/remotes/vcenter/rm +++ b/src/datastore_mad/remotes/vcenter/rm @@ -72,8 +72,9 @@ begin ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) end rescue Exception => e - STDERR.puts "Error deleting virtual disk #{img_src}."\ - " Reason: \"#{e.message}\"\n#{e.backtrace}" + message = "Error deleting virtual disk #{img_src}."\ + " Reason: \"#{e.message}\"\n#{e.backtrace}" + STDERR.puts error_message(message) exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/stat b/src/datastore_mad/remotes/vcenter/stat index 9d99f76ba9..2b3ca2fffc 100755 --- a/src/datastore_mad/remotes/vcenter/stat +++ b/src/datastore_mad/remotes/vcenter/stat @@ -56,8 +56,9 @@ if img_path.start_with? "vcenter://" puts ds.stat(img_path.sub("vcenter://","")) rescue Exception => e - STDERR.puts "Error calculating image #{img_path} size."\ - " Reason: \"#{e.message}\"\n#{e.backtrace}" + message = "Error calculating image #{img_path} size."\ + " Reason: \"#{e.message}\"\n#{e.backtrace}" + STDERR.puts error_message(message) exit -1 ensure vi_client.close_connection if vi_client