Merge pull request resque#307 from dpiddy/master

Change worker child exit to use `exit` instead of `exit!`
rcarver · May 26, 2011 · 8662707 · 8662707
2 parents 8e7c205 + f3bbf99
commit 8662707
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,7 @@ source :rubygems
 gemspec
 
 group :test do
+  gem "rake"
   gem "rack-test", "~> 0.5"
   gem "mocha", "~> 0.9.7"
   gem "leftright", :platforms => :mri_18

diff --git a/lib/resque/worker.rb b/lib/resque/worker.rb
@@ -128,7 +128,7 @@ def work(interval = 5.0, &block)
           else
             procline "Processing #{job.queue} since #{Time.now.to_i}"
             perform(job, &block)
-            exit! unless @cant_fork
+            exit unless @cant_fork
           end
 
           done_working
@@ -302,7 +302,7 @@ def kill_child
     def paused?
       @paused
     end
-    
+
     # Stop processing jobs after the current one has completed (if we're
     # currently running one).
     def pause_processing