avoid "can't be called from trap context" Ruby 2.0

closes gh-98
jmettraux · Feb 13, 2014 · ceb833b · ceb833b
1 parent ac58ebb
commit ceb833b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.0.6    not yet released
+
+- avoid "can't be called from trap context" on Ruby 2.0, gh-98
+
+
 == rufus-scheduler - 3.0.5    released 2014/01/30
 
 - implement Job#call(do_rescue=false), gh-97

diff --git a/lib/rufus/scheduler.rb b/lib/rufus/scheduler.rb
@@ -124,7 +124,9 @@ def shutdown(opt=nil)
 
       @started_at = nil
 
-      jobs.each { |j| j.unschedule }
+      #jobs.each { |j| j.unschedule }
+        # provokes https://github.com/jmettraux/rufus-scheduler/issue/98
+      @jobs.array.each { |j| j.unschedule }
 
       @work_queue.clear
 

diff --git a/lib/rufus/scheduler/job_array.rb b/lib/rufus/scheduler/job_array.rb
@@ -78,6 +78,13 @@ def [](job_id)
 
         @mutex.synchronize { @array.find { |j| j.job_id == job_id } }
       end
+
+      # Only used when shutting down, directly yields the underlying array.
+      #
+      def array
+
+        @array
+      end
     end
   end
 end