rufus-scheduler 3.0.1 → 3.0.2

data/CHANGELOG.txt

@@ -2,7 +2,14 @@
 = rufus-scheduler CHANGELOG.txt
 
 
-== rufus-scheduler - 3.0.1    not yet released
+== rufus-scheduler - 3.0.2    released 2013/10/22
+
+- default :max_work_threads to 28
+- fix "rufus rushes to create work threads" issue, thanks Gatis Tomsons
+- introduce Rufus::Scheduler::NotRunningError, thanks Gatis Tomsons
+
+
+== rufus-scheduler - 3.0.1    released 2013/10/19
 
 - fix post_install_message, thanks Ted Pennings
 - bring back .parse_time_string and .parse_duration_string
@@ -154,5 +161,9 @@
 == rufus-scheduler - 2.0.1    released 2009/05/07
 == rufus-scheduler - 2.0.0    released 2009/05/07
 
+...
+
 - initial release
 
+(was openwferu-scheduler before that)
+

data/CREDITS.txt

@@ -28,7 +28,7 @@
 
 == Feedback
 
-- Gatis Tomsons - https://github.io/gacha - heavy duty work threads
+- Gatis Tomsons - https://github.io/gacha - heavy work threads and lock errors
 - https://github.com/joast - missing .to_time_string alias (code and doc)
 - Tamir Duberstein - https://github.com/tamird - rdoc inaccuracies
 - Kevin Bouwkamp - https://github.com/bmxpert1 - first_at issues

data/README.md

@@ -966,7 +966,7 @@ This is useful in environments where the Ruby process holding the scheduler gets
 
 ### :max_work_threads
 
-In rufus-scheduler 2.x, by default, each job triggering received its own, new, hthread of execution. In rufus-scheduler 3.x, execution happens in a work thread and the max work thread count defaults to 35.
+In rufus-scheduler 2.x, by default, each job triggering received its own, new, hthread of execution. In rufus-scheduler 3.x, execution happens in a work thread and the max work thread count defaults to 28.
 
 One can set this maximum value when starting the scheduler.
 

data/lib/rufus/scheduler.rb

@@ -38,15 +38,26 @@ module Rufus
     require 'rufus/scheduler/cronline'
     require 'rufus/scheduler/job_array'
 
-    VERSION = '3.0.1'
+    VERSION = '3.0.2'
+
+    #
+    # A common error class for rufus-scheduler
+    #
+    class Error < StandardError; end
 
     #
     # This error is thrown when the :timeout attribute triggers
     #
-    class TimeoutError < StandardError; end
+    class TimeoutError < Error; end
 
-    #MIN_WORK_THREADS = 7
-    MAX_WORK_THREADS = 35
+    #
+    # For when the scheduler is not running
+    # (it got shut down or didn't start because of a lock)
+    #
+    class NotRunningError < Error; end
+
+    #MIN_WORK_THREADS = 3
+    MAX_WORK_THREADS = 28
 
     attr_accessor :frequency
     attr_reader :started_at
@@ -140,6 +151,10 @@ module Rufus
 
     def join
 
+      fail NotRunningError.new(
+        'cannot join scheduler that is not running'
+      ) unless @thread
+
       @thread.join
     end
 
@@ -502,7 +517,7 @@ module Rufus
 
     def do_schedule(job_type, t, callable, opts, return_job_instance, block)
 
-      raise RuntimeError.new(
+      fail NotRunningError.new(
         'cannot schedule, scheduler is down or shutting down'
       ) if @started_at == nil
 

data/lib/rufus/scheduler/jobs.rb

@@ -82,8 +82,6 @@ module Rufus
         @scheduled_at = Time.now
         @unscheduled_at = nil
         @last_time = nil
-        #@mutexes = {}
-        #@pool_mutex = Mutex.new
 
         @locals = {}
         @local_mutex = Mutex.new
@@ -290,15 +288,15 @@ module Rufus
 
       def do_trigger_in_thread(time)
 
-        #@pool_mutex.synchronize do
+        threads = @scheduler.work_threads
 
-        count = @scheduler.work_threads.size
-        #vacant = threads.select { |t| t[:rufus_scheduler_job] == nil }.size
+        cur = threads.size
+        vac = threads.select { |t| t[:rufus_scheduler_job] == nil }.size
         #min = @scheduler.min_work_threads
         max = @scheduler.max_work_threads
+        que = @scheduler.work_queue.size
 
-        start_work_thread if count < max
-        #end
+        start_work_thread if vac - que < 1 && cur < max
 
         @scheduler.work_queue << [ self, time ]
       end

data/spec/job_repeat_spec.rb

@@ -231,16 +231,21 @@ describe Rufus::Scheduler::RepeatJob do
     it 'unschedules the job after the last_at time' do
 
       t = Time.now + 2
+
       counter = 0
+      tt = nil
 
       job =
         @scheduler.schedule_every '0.5s', :last => t do
           counter = counter + 1
+          tt = Time.now
         end
 
       sleep 3
 
-      counter.should == 3
+      #counter.should == 3
+      [ 3, 4 ].should include(counter)
+      tt.should < t
       @scheduler.jobs.should_not include(job)
     end
 

data/spec/scheduler_spec.rb

@@ -154,7 +154,7 @@ describe Rufus::Scheduler do
 
       lambda {
         @scheduler.in('0s') { puts 'hhhhhhhhhhhello!!' }
-      }.should raise_error(RuntimeError)
+      }.should raise_error(Rufus::Scheduler::NotRunningError)
     end
   end
 
@@ -373,15 +373,16 @@ describe Rufus::Scheduler do
     it 'lists all the work threads in the pool' do
 
       @scheduler.in '0s' do
-        # nada
+        sleep(0.2)
       end
       @scheduler.in '0s' do
-        sleep(2)
+        sleep(2.0)
       end
 
       sleep 0.6
 
       @scheduler.work_threads.size.should == 2
+      @scheduler.work_threads(:all).size.should == 2
     end
   end
 
@@ -392,17 +393,18 @@ describe Rufus::Scheduler do
       @scheduler.work_threads(:vacant).should == []
     end
 
-    it 'lists all the work threads in the pool' do
+    it 'lists all the vacant work threads in the pool' do
 
       @scheduler.in '0s' do
-        # nada
+        sleep(0.2)
       end
       @scheduler.in '0s' do
-        sleep(2)
+        sleep(2.0)
       end
 
-      sleep 0.4
+      sleep 0.6
 
+      @scheduler.work_threads(:all).size.should == 2
       @scheduler.work_threads(:vacant).size.should == 1
     end
   end
@@ -452,7 +454,7 @@ describe Rufus::Scheduler do
 
   #describe '#min_work_threads' do
   #  it 'returns the min job thread count' do
-  #    @scheduler.min_work_threads.should == 7
+  #    @scheduler.min_work_threads.should == 3
   #  end
   #end
   #describe '#min_work_threads=' do
@@ -466,7 +468,7 @@ describe Rufus::Scheduler do
 
     it 'returns the max job thread count' do
 
-      @scheduler.max_work_threads.should == 35
+      @scheduler.max_work_threads.should == 28
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -102,7 +102,7 @@ files:
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
-post_install_message: ! "\n***\n\nThanks for installing rufus-scheduler 3.0.1\n\nIt
+post_install_message: ! "\n***\n\nThanks for installing rufus-scheduler 3.0.2\n\nIt
   might not be 100% compatible with rufus-scheduler 2.x.\n\nIf you encounter issues
   with this new rufus-scheduler, especially\nif your app worked fine with previous
   versions of it, you can\n\nA) Forget it and peg your Gemfile to rufus-scheduler