Merge pull request #20321 from agrare/move_systemd_env_var_check

Move the systemd env var check into the systemd_worker? method
ManageIQ · Jul 2, 2020 · 3a7421c · 3a7421c
2 parents 1d55261 + e1bbb20
commit 3a7421c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/miq_worker.rb b/app/models/miq_worker.rb
@@ -316,15 +316,15 @@ def containerized_worker?
   end
 
   def self.systemd_worker?
-    MiqEnvironment::Command.supports_systemd? && supports_systemd?
+    ENV['MIQ_SYSTEMD_WORKERS'] && MiqEnvironment::Command.supports_systemd? && supports_systemd?
   end
 
   def systemd_worker?
     self.class.systemd_worker?
   end
 
   def start_runner
-    if ENV['MIQ_SYSTEMD_WORKERS'] && systemd_worker?
+    if systemd_worker?
       start_systemd_worker
     elsif containerized_worker?
       start_runner_via_container