Skip to content

Commit fb7b0d9

Browse files
authored
Merge pull request #832 from agrare/fix_join_active_record_duration_type_error
2 parents 6021975 + 2055044 commit fb7b0d9

File tree

1 file changed

+1
-1
lines changed
  • app/models/manageiq/providers/vmware/infra_manager/inventory

1 file changed

+1
-1
lines changed

app/models/manageiq/providers/vmware/infra_manager/inventory/collector.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def stop(join_timeout = 2.minutes)
3232
if vim_thread
3333
# Give the collector thread a chance to exit cleanly, then kill it to
3434
# ensure we don't have multiple collector threads running.
35-
result = vim_thread.join(join_timeout)
35+
result = vim_thread.join(join_timeout.to_f)
3636
vim_thread.kill if result.nil?
3737
end
3838

0 commit comments

Comments
 (0)