bring up to Celluloid 0.17.1.1 compatibility: TaskTerminated is now a…

…n Exception but not a StandardError
hakimkal · Aug 13, 2015 · 01e73b8 · 01e73b8
1 parent 2370aee
commit 01e73b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/sidekiq/fetch.rb b/lib/sidekiq/fetch.rb
@@ -66,7 +66,7 @@ def handle_fetch_exception(ex)
       @down ||= Time.now
       pause
       after(0) { fetch }
-    rescue Task::TerminatedError
+    rescue Celluloid::TaskTerminated
       # If redis is down when we try to shut down, all the fetch backlog
       # raises these errors.  Haven't been able to figure out what I'm doing wrong.
     end

diff --git a/lib/sidekiq/scheduled.rb b/lib/sidekiq/scheduled.rb
@@ -104,7 +104,7 @@ def initial_wait
           # of workers), and 5 random seconds to ensure they don't all hit Redis at the same time.
           sleep(INITIAL_WAIT) unless Sidekiq.options[:poll_interval_average]
           sleep(5 * rand)
-        rescue Celluloid::Task::TerminatedError
+        rescue Celluloid::TaskTerminated
           # Hit Ctrl-C when Sidekiq is finished booting and we have a chance
           # to get here.
         end