Check for update_driven_refresh setting existance

ManageIQ · Jul 26, 2017 · 94d85ed · 94d85ed
1 parent 153cf09
commit 94d85ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/models/miq_vim_broker_worker.rb b/app/models/miq_vim_broker_worker.rb
@@ -2,16 +2,14 @@ class MiqVimBrokerWorker < MiqWorker
   require_nested :Runner
 
   self.required_roles         = lambda {
-    roles = %w(
+    %w(
       ems_metrics_collector
       ems_operations
       smartproxy
       smartstate
-    )
-
-    roles << 'ems_inventory' unless Settings.prototype.ems_vmware.update_driven_refresh
-
-    roles
+    ).tap do |roles|
+      roles << 'ems_inventory' unless Settings.prototype.try(:ems_vmware).try(:update_driven_refresh)
+    end
   }
 
   self.check_for_minimal_role = false

diff --git a/app/models/miq_vim_broker_worker/runner.rb b/app/models/miq_vim_broker_worker/runner.rb
@@ -46,7 +46,7 @@ def reset_broker_update_sleep_interval
   end
 
   def has_ems_inventory_role?
-    @active_roles.include?("ems_inventory") && !Settings.prototype.ems_vmware.update_driven_refresh
+    @active_roles.include?("ems_inventory") && !Settings.prototype.try(:ems_vmware).try(:update_driven_refresh)
   end
 
   def reset_broker_update_notification