Skip to content

Commit 8662707

Browse files
committed
Merge pull request resque#307 from dpiddy/master
Change worker child exit to use `exit` instead of `exit!`
2 parents 8e7c205 + f3bbf99 commit 8662707

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ source :rubygems
33
gemspec
44

55
group :test do
6+
gem "rake"
67
gem "rack-test", "~> 0.5"
78
gem "mocha", "~> 0.9.7"
89
gem "leftright", :platforms => :mri_18

lib/resque/worker.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def work(interval = 5.0, &block)
128128
else
129129
procline "Processing #{job.queue} since #{Time.now.to_i}"
130130
perform(job, &block)
131-
exit! unless @cant_fork
131+
exit unless @cant_fork
132132
end
133133

134134
done_working
@@ -302,7 +302,7 @@ def kill_child
302302
def paused?
303303
@paused
304304
end
305-
305+
306306
# Stop processing jobs after the current one has completed (if we're
307307
# currently running one).
308308
def pause_processing

0 commit comments

Comments
 (0)