diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 6913f58..a37a6c4 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -330,11 +330,11 @@ module Vmpooler $logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds") $metrics.timing("clone.#{pool_name}", finish) - rescue StandardError => _e + rescue StandardError $redis.srem("vmpooler__pending__#{pool_name}", new_vmname) expiration_ttl = $config[:redis]['data_ttl'].to_i * 60 * 60 $redis.expire("vmpooler__vm__#{new_vmname}", expiration_ttl) - raise _e + raise ensure $redis.decr('vmpooler__tasks__clone') end @@ -1153,7 +1153,7 @@ module Vmpooler begin inventory = create_inventory(pool, provider, pool_check_response) - rescue StandardError => e + rescue StandardError return(pool_check_response) end diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb index c8ef09a..2c9854a 100644 --- a/lib/vmpooler/providers/vsphere.rb +++ b/lib/vmpooler/providers/vsphere.rb @@ -173,9 +173,9 @@ module Vmpooler target[dc]['checking'] = true hosts_hash = find_least_used_hosts(cluster, datacenter, percentage) target[dc] = hosts_hash - rescue StandardError => _e + rescue StandardError target[dc] = {} - raise(_e) + raise ensure target[dc]['check_time_finished'] = Time.now end @@ -344,11 +344,11 @@ module Vmpooler begin vm_target_folder = find_vm_folder(pool_name, connection) vm_target_folder = create_folder(connection, target_folder_path, target_datacenter_name) if vm_target_folder.nil? && @config[:config].key?('create_folders') && (@config[:config]['create_folders'] == true) - rescue StandardError => _e + rescue StandardError if @config[:config].key?('create_folders') && (@config[:config]['create_folders'] == true) vm_target_folder = create_folder(connection, target_folder_path, target_datacenter_name) else - raise(_e) + raise end end @@ -986,9 +986,9 @@ module Vmpooler else logger.log('s', "[ ] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}") end - rescue StandardError => _e + rescue StandardError logger.log('s', "[!] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}") - raise _e + raise end end end