Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the systemd env var check into the systemd_worker? method #20321

Merged
merged 1 commit into from
Jul 2, 2020
+2 −2
Merged

Move the systemd env var check into the systemd_worker? method #20321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/miq_worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down