Do not save exception in a variable if it isn't referenced

Prior to this commit there were a couple locations where exceptions were
saved to `_e` but weren't used in the handler except to re-raise the
exception, which simply calling the `raise` keyword will do without a
provided argument.
This commit removes the unnecessary assignment of the exception to a
variable and simply uses `raise` instead.
This commit is contained in:
Brandon High 2020-03-05 14:44:23 -08:00
parent 7657ec127c
commit 0b841d63fd
No known key found for this signature in database
GPG key ID: 270079C784FCAFDE
2 changed files with 9 additions and 9 deletions

View file

@ -330,11 +330,11 @@ module Vmpooler
$logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds") $logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds")
$metrics.timing("clone.#{pool_name}", finish) $metrics.timing("clone.#{pool_name}", finish)
rescue StandardError => _e rescue StandardError
$redis.srem("vmpooler__pending__#{pool_name}", new_vmname) $redis.srem("vmpooler__pending__#{pool_name}", new_vmname)
expiration_ttl = $config[:redis]['data_ttl'].to_i * 60 * 60 expiration_ttl = $config[:redis]['data_ttl'].to_i * 60 * 60
$redis.expire("vmpooler__vm__#{new_vmname}", expiration_ttl) $redis.expire("vmpooler__vm__#{new_vmname}", expiration_ttl)
raise _e raise
ensure ensure
$redis.decr('vmpooler__tasks__clone') $redis.decr('vmpooler__tasks__clone')
end end
@ -1153,7 +1153,7 @@ module Vmpooler
begin begin
inventory = create_inventory(pool, provider, pool_check_response) inventory = create_inventory(pool, provider, pool_check_response)
rescue StandardError => e rescue StandardError
return(pool_check_response) return(pool_check_response)
end end

View file

@ -173,9 +173,9 @@ module Vmpooler
target[dc]['checking'] = true target[dc]['checking'] = true
hosts_hash = find_least_used_hosts(cluster, datacenter, percentage) hosts_hash = find_least_used_hosts(cluster, datacenter, percentage)
target[dc] = hosts_hash target[dc] = hosts_hash
rescue StandardError => _e rescue StandardError
target[dc] = {} target[dc] = {}
raise(_e) raise
ensure ensure
target[dc]['check_time_finished'] = Time.now target[dc]['check_time_finished'] = Time.now
end end
@ -344,11 +344,11 @@ module Vmpooler
begin begin
vm_target_folder = find_vm_folder(pool_name, connection) 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) 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) if @config[:config].key?('create_folders') && (@config[:config]['create_folders'] == true)
vm_target_folder = create_folder(connection, target_folder_path, target_datacenter_name) vm_target_folder = create_folder(connection, target_folder_path, target_datacenter_name)
else else
raise(_e) raise
end end
end end
@ -986,9 +986,9 @@ module Vmpooler
else else
logger.log('s', "[ ] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}") logger.log('s', "[ ] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}")
end end
rescue StandardError => _e rescue StandardError
logger.log('s', "[!] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}") logger.log('s', "[!] [#{pool_name}] '#{vm_name}' is running on #{vm_hash['host_name']}")
raise _e raise
end end
end end
end end