Skip to content

Commit cfc4326

Browse files
author
Brandon High
committed
Use consistent Style/NumericPredicate redux
Prior to this commit the codebase used the `zero?` method for comparing to 0 on some places and not in others. This commit makes all comparison to zero consistently use the `==`.
1 parent 7dadaed commit cfc4326

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/vmpooler/pool_manager.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ def check_disk_queue(maxloop = 0, loop_delay = 5)
619619
_check_disk_queue
620620
sleep(loop_delay)
621621

622-
unless maxloop.zero?
622+
unless maxloop == 0
623623
break if loop_count >= maxloop
624624

625625
loop_count += 1
@@ -655,7 +655,7 @@ def check_snapshot_queue(maxloop = 0, loop_delay = 5)
655655
_check_snapshot_queue
656656
sleep(loop_delay)
657657

658-
unless maxloop.zero?
658+
unless maxloop == 0
659659
break if loop_count >= maxloop
660660

661661
loop_count += 1
@@ -816,7 +816,7 @@ def check_pool(pool,
816816
end
817817
sleep_with_wakeup_events(loop_delay, loop_delay_min, pool_size_change: true, poolname: pool['name'], pool_template_change: true, clone_target_change: true, pool_reset: true)
818818

819-
unless maxloop.zero?
819+
unless maxloop == 0
820820
break if loop_count >= maxloop
821821

822822
loop_count += 1
@@ -1119,8 +1119,8 @@ def repopulate_pool_vms(pool_name, provider, pool_check_response, pool_size)
11191119
$metrics.gauge("running.#{pool_name}", $redis.scard("vmpooler__running__#{pool_name}"))
11201120

11211121
if $redis.get("vmpooler__empty__#{pool_name}")
1122-
$redis.del("vmpooler__empty__#{pool_name}") unless ready.zero?
1123-
elsif ready.zero?
1122+
$redis.del("vmpooler__empty__#{pool_name}") unless ready == 0
1123+
elsif ready == 0
11241124
$redis.set("vmpooler__empty__#{pool_name}", 'true')
11251125
$logger.log('s', "[!] [#{pool_name}] is empty")
11261126
end
@@ -1304,7 +1304,7 @@ def execute!(maxloop = 0, loop_delay = 1)
13041304

13051305
sleep(loop_delay)
13061306

1307-
unless maxloop.zero?
1307+
unless maxloop == 0
13081308
break if loop_count >= maxloop
13091309

13101310
loop_count += 1

lib/vmpooler/providers/vsphere.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def wait_for_host_selection(dc, target, maxloop = 0, loop_delay = 1, max_age = 6
206206
loop_count = 1
207207
until target.key?(dc) && target[dc].key?('check_time_finished')
208208
sleep(loop_delay)
209-
unless maxloop.zero?
209+
unless maxloop == 0
210210
break if loop_count >= maxloop
211211

212212
loop_count += 1
@@ -217,7 +217,7 @@ def wait_for_host_selection(dc, target, maxloop = 0, loop_delay = 1, max_age = 6
217217
loop_count = 1
218218
while Time.now - target[dc]['check_time_finished'] > max_age
219219
sleep(loop_delay)
220-
unless maxloop.zero?
220+
unless maxloop == 0
221221
break if loop_count >= maxloop
222222

223223
loop_count += 1

0 commit comments

Comments
 (0)