Merge pull request #837 from agrare/update_for_worker_settings

Update to use normalized worker_settings from core

Author: Fryguy

app/models/manageiq/providers/vmware/infra_manager/event_catcher.rb

@@ -2,4 +2,9 @@ class ManageIQ::Providers::Vmware::InfraManager::EventCatcher < ManageIQ::Provid
   require_nested :Runner
 
   self.rails_worker = -> { !!worker_settings[:rails_worker] }
+  self.worker_settings_paths = [
+    %i[http_proxy vmwarews],
+    %i[log level_vim],
+    %i[ems ems_vmware]
+  ]
 end

workers/event_catcher/event_catcher.rb

@@ -1,6 +1,4 @@
 require_relative "event_parser"
-require "active_support/core_ext/numeric/time"
-require "more_core_extensions/core_ext/string/to_i_with_method"
 
 class EventCatcher
   def initialize(ems, endpoint, authentication, settings, messaging, logger, page_size = 20)
@@ -164,10 +162,6 @@ def heartbeat_to_file
   end
 
   def heartbeat_timeout
-    timeout   = settings.dig(:workers, :worker_base, :event_catcher, :event_catcher_vmware, :heartbeat_timeout)
-    timeout ||= settings.dig(:workers, :worker_base, :defaults, :heartbeat_timeout)
-    timeout ||= "2.minutes"
-
-    Time.now.to_i + timeout.to_i_with_method
+    Time.now.to_i + (settings.dig("worker_settings", "heartbeat_timeout") || 120)
   end
 end

workers/event_catcher/worker

@@ -5,10 +5,8 @@ require "bundler/inline"
 gemfile(false) do
   source "https://rubygems.org"
 
-  gem "activesupport", "~>6.1.6"
   gem "manageiq-loggers", "~>1.0"
   gem "manageiq-messaging", "~> 1.0"
-  gem "more_core_extensions"
   gem "rbvmomi2", "~> 3.3"
   if ENV.fetch("APPLIANCE", nil)
     gem "sd_notify"