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

Jump to bottom

Fix minor typos/issues with PR #15818 #15827

Merged
merged 2 commits into from
Aug 17, 2017
Merged

Fix minor typos/issues with PR #15818 #15827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e729fe8
Fix typo with @sigterm_received instance variable
NickLaMuro Aug 16, 2017
124cdd9
Initialize @sigterm_received instance variable
NickLaMuro Aug 16, 2017
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
7 changes: 4 additions & 3 deletions app/models/miq_worker/runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def initialize(cfg = {})
$log ||= Rails.logger

@server = MiqServer.my_server(true)
@sigterm_received = false

worker_initialization
after_initialize
Expand Down Expand Up @@ -343,7 +344,7 @@ def do_work_loop

# Should be caught by the rescue in `#start` and will run do_exit from
# there.
raise Interrupt if @sigterm_recieved
raise Interrupt if @sigterm_received

do_gc
self.class.log_ruby_object_usage(worker_settings[:top_ruby_object_classes_to_log].to_i)
Expand Down Expand Up @@ -469,8 +470,8 @@ def self.log_ruby_object_usage(top = 20)
# received from the container management system (aka OpenShift). The SIGINT
# trap is mostly a developer convenience.
def setup_sigterm_trap
Kernel.trap("TERM") { @sigterm_recieved = true }
Kernel.trap("INT") { @sigterm_recieved = true }
Kernel.trap("TERM") { @sigterm_received = true }
Kernel.trap("INT") { @sigterm_received = true }
end

protected
Expand Down