say_when 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff56cfaa645736fcace3c95f0d9f20a35b7785aa2be6cd544caee8ecb3d0b537
-  data.tar.gz: e04c3cbf9dfff48405d88a574aab8ebd1bf85bb747f6223efa3df184f9e485bb
+  metadata.gz: 39f0c8806fd8c11484d52818cb71a42e71e60b62c8cf19af670f8db7e06d3c17
+  data.tar.gz: 2e22ba68d95307e93f019381399ed46b257d5170dc45f5d99fb06d8cb7832b48
 SHA512:
-  metadata.gz: 16b737f008959d234f85f9d8100bb5503500c6b0d8acdb5c78f9306e7c7ac7166571d9021a69daba2406e29e112cba8e0b0b27bd222edb7dfae6b2ceb62f8264
-  data.tar.gz: 020d6842616be2b4984f6f7202279d09660646b112a7d0b24cffad38a6be711a1ee257f12eb4fc64aaa861816e2ba75673f773b4bca54c1af131b91029198ebe
+  metadata.gz: 9c11c37dea5355c17ac03ebfd589d769cd5526d11d34864b7890185e89aae593dfa92e58616dfa0305686c8885ac6eaaa65f955bf03d479c49151abe2385286a
+  data.tar.gz: 86790a64921d0f8cbbb92a11968bf036a76180c3d9fc40acec3cfd19a5e00e21c5a81f5e7029e3c23f0efbc8febc7bb8c2237f065b83e2788ac20f835e464c83

data/lib/say_when/scheduler.rb

@@ -77,6 +77,18 @@ module SayWhen
       logger.info "SayWhen::Scheduler stopped"
     end
 
+    def process_waiting_jobs(max_jobs=1000)
+      jobs_processed = 0
+      while(jobs_processed < max_jobs)
+        if job = process_jobs
+          jobs_processed += 1
+        else
+          break
+        end
+      end
+      return jobs_processed
+    end
+
     def process_jobs
       job = nil
       time_now = Time.now
@@ -99,7 +111,7 @@ module SayWhen
       if job.nil?
         logger.debug "SayWhen:: no jobs to acquire, sleep"
         sleep(tick_length)
-        return
+        return job
       end
 
       begin
@@ -115,12 +127,15 @@ module SayWhen
         job_error("Failure to process", job, ex)
       end
 
-    rescue Interrupt => ex
-      job_error("Interrupt!", job, ex)
-      raise ex
+      return job
+
     rescue StandardError => ex
       job_error("Error!", job, ex)
       sleep(tick_length)
+      return job
+    rescue Interrupt => ex
+      job_error("Interrupt!", job, ex)
+      raise ex
     rescue Exception => ex
       job_error("Exception!", job, ex)
       raise ex

data/lib/say_when/storage/active_record/job.rb

@@ -35,7 +35,7 @@ module SayWhen
                               :order      => 'next_fire_at ASC',
                               :conditions => ['status = ? and ? >= next_fire_at',
                                               STATE_WAITING,
-                                              no_later_than.in_time_zone('UTC')])
+                                              no_later_than])
 
               # set status to acquired to take it out of rotation
               @next_job.update_attribute(:status, STATE_ACQUIRED) unless @next_job.nil?

data/lib/say_when/version.rb

@@ -1,3 +1,3 @@
 module SayWhen
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/say_when/scheduler_spec.rb

@@ -25,6 +25,7 @@ describe SayWhen::Scheduler do
         scheduler.storage_strategy = :active_record
         scheduler.processor_class  = SayWhen::Test::TestProcessor
       end
+      SayWhen::Storage::ActiveRecord::Job.delete_all
 
       job = SayWhen::Scheduler.schedule(
         :trigger_strategy => 'once',
@@ -35,6 +36,58 @@ describe SayWhen::Scheduler do
       job.should_not be_nil
     end
 
+    it "can process jobs when there are no jobs" do
+      SayWhen::Storage::ActiveRecord::Job.delete_all
+
+      SayWhen::Scheduler.configure do |scheduler|
+        scheduler.storage_strategy = :active_record
+        scheduler.processor_class  = SayWhen::Test::TestProcessor
+      end
+      job = SayWhen::Scheduler.scheduler.process_jobs
+      job.should be_nil
+    end
+
+    it "can process jobs when there is a job" do
+      SayWhen::Storage::ActiveRecord::Job.delete_all
+
+      SayWhen::Scheduler.configure do |scheduler|
+        scheduler.storage_strategy = :active_record
+        scheduler.processor_class  = SayWhen::Test::TestProcessor
+      end
+
+      job = SayWhen::Scheduler.schedule(
+        :trigger_strategy => 'once',
+        :trigger_options  => {:at => 1.second.since},
+        :job_class        => 'SayWhen::Test::TestTask',
+        :job_method       => 'execute'
+      )
+      sleep(1)
+
+      processed_job = SayWhen::Scheduler.scheduler.process_jobs
+      processed_job.should_not be_nil
+      processed_job.should == job
+    end
+
+    it "can process multiple waiting jobs" do
+      SayWhen::Scheduler.configure do |scheduler|
+        scheduler.storage_strategy = :active_record
+        scheduler.processor_class  = SayWhen::Test::TestProcessor
+      end
+      SayWhen::Storage::ActiveRecord::Job.delete_all
+
+      opts = {
+        :trigger_strategy => 'once',
+        :trigger_options  => {:at => 1.seconds.since},
+        :job_class        => 'SayWhen::Test::TestTask',
+        :job_method       => 'execute'
+      }
+
+      10.times{ SayWhen::Scheduler.schedule(opts) }
+      sleep(1)
+
+      job_count = SayWhen::Scheduler.scheduler.process_waiting_jobs(100)
+      job_count.should == 10
+    end
   end
 
   describe "instance methods" do
@@ -69,8 +122,5 @@ describe SayWhen::Scheduler do
       # puts 'wait for it'
       @scheduler.running.should == false
     end
-
   end
-
-
 end

data/spec/say_when/storage/active_record/job_spec.rb

@@ -73,8 +73,7 @@ describe SayWhen::Storage::ActiveRecord::Job do
 
     j1 = SayWhen::Storage::ActiveRecord::Job.create(@valid_attributes)
     j2 = SayWhen::Storage::ActiveRecord::Job.create(j2_opts)
-    acquire = 1.day.since
-    next_job = SayWhen::Storage::ActiveRecord::Job.acquire_next(acquire)
+    next_job = SayWhen::Storage::ActiveRecord::Job.acquire_next(25.hours.since)
     next_job.should == j2
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: say_when
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemessaging